tree e75891e2bb4f3293198ddb05de5660308f870f94
parent 9d25fcae8560a2e2bc2e28b08778bd1a94261cd1
parent b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718
author Elliott Hughes <enh@google.com> 1423082279 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423082279 +0000

am b2d7ca7c: am fd2c1307: Merge "Fix build."

* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718':
  Fix build.