OSDN Git Service

Merge "Fix build for gcc."
authorChristopher Ferris <cferris@google.com>
Mon, 25 Jan 2016 22:48:44 +0000 (22:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Jan 2016 22:48:44 +0000 (22:48 +0000)
commitee6936ca39702577be30a36d66b29a4318b6d624
tree561114e7101e55d8ae0fa7e8610124100adcef77
parenta5279732c48843bf8ed0b85460b19bceccb51d16
parente40e429753cfe84fee0aaf553b57ce8679a28c9d
Merge "Fix build for gcc."
am: e40e429753

* commit 'e40e429753cfe84fee0aaf553b57ce8679a28c9d':
  Fix build for gcc.