tree f0138835e5ddd3595c732e09dd8145bd19eb1e1e
parent db64454b3354e26c96fdb83a4443cce12e352640
parent 4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b
author Lorenzo Colitti <lorenzo@google.com> 1426230474 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426230474 +0000

am 4a61eaf7: am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/"

* commit '4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b':
  Fix build, broken by https://android-review.googlesource.com/#/c/115890/