OSDN Git Service

Merge "Fix GCC build." am: ef2ba3dbf9
authorElliott Hughes <enh@google.com>
Sat, 5 Dec 2015 00:06:11 +0000 (16:06 -0800)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Dec 2015 00:06:11 +0000 (16:06 -0800)
am: 70d477c913

* commit '70d477c913981047235054b6bbb4faa5bfcafb8f':
  Fix GCC build.


Trivial merge