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)
* commit 'ddad384dbf802bf258e19a8d18f5d9e9fba8f97b':
  Fix build.


Trivial merge