OSDN Git Service

Merge "Fix build for gcc." am: e40e429753
authorChristopher Ferris <cferris@google.com>
Mon, 25 Jan 2016 22:50:54 +0000 (22:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jan 2016 22:50:54 +0000 (22:50 +0000)
am: ee6936ca39

* commit 'ee6936ca39702577be30a36d66b29a4318b6d624':
  Fix build for gcc.


Trivial merge