OSDN Git Service

Merge "Fix GCC build breakage."
authorElliott Hughes <enh@google.com>
Tue, 19 Jan 2016 17:52:21 +0000 (17:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 19 Jan 2016 17:52:21 +0000 (17:52 +0000)
am: 579f42b789

* commit '579f42b78922d8c70e19ea77d2818ec17d0dc6a7':
  Fix GCC build breakage.


Trivial merge