OSDN Git Service

am ddad384d: Merge "Fix build."
authorElliott Hughes <enh@google.com>
Sat, 1 Mar 2014 02:05:38 +0000 (02:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Mar 2014 02:05:38 +0000 (02:05 +0000)
commit3c42b73985817da87c32c2d97a58e5e4f21d48a6
treed36173147fe379d5b636503743b6fe37455322a0
parent5b9d3ddf372ca47e3065845487a770794021c760
parentddad384dbf802bf258e19a8d18f5d9e9fba8f97b
am ddad384d: Merge "Fix build."

* commit 'ddad384dbf802bf258e19a8d18f5d9e9fba8f97b':
  Fix build.