tree 9764081b84c3d80e6b2ac2df93da915f27d22d46
parent a63cda7b2417c32b48e09c03584a89f818b0b1da
parent 1b6dc49e372756962ec1b455d98ea970bb33371e
author RoboErik <epastern@google.com> 1409286000 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409286000 +0000

am 501244ea: am 563efe4c: am 85f23210: Fix test build

* commit '501244eaec4207efd413bac4b0bb86ec15f97bf5':
  Fix test build