tree 0b8280c528fa7a4eb02fde8299bb36ec52c72536
parent 90301c87d149befa084b0a27045e958472808896
parent f23d7ff2bf58d3eab58eb7088d2c6503bd2f6f43
author Narayan Kamath <narayan@google.com> 1414010720 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414010720 +0000

am f23d7ff2: am bee2ddef: Merge "Fix BuildTest." into lmp-dev

* commit 'f23d7ff2bf58d3eab58eb7088d2c6503bd2f6f43':
  Fix BuildTest.