OSDN Git Service

am d68e252e: am d937f275: am 12928a07: am 2336c4ec: Merge "Fix build."
authorElliott Hughes <enh@google.com>
Mon, 28 Apr 2014 21:22:12 +0000 (21:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 28 Apr 2014 21:22:12 +0000 (21:22 +0000)
* commit 'd68e252e424e894eeef17b4bd8f4e89f33a31bc4':
  Fix build.


Trivial merge