OSDN Git Service

am 3c42b739: am ddad384d: Merge "Fix build."
authorElliott Hughes <enh@google.com>
Sat, 1 Mar 2014 02:12:59 +0000 (02:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 1 Mar 2014 02:12:59 +0000 (02:12 +0000)
* commit '3c42b73985817da87c32c2d97a58e5e4f21d48a6':
  Fix build.


Trivial merge