tree f2d6902e5f85b227e9a4b58ba5eb2ea4fee17ace
parent 875cdbd24b1ab3627d9663a49fcb943cdb5b91b4
parent b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b
author The Android Automerger <android-build@google.com> 1427403622 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427403622 +0000

am b2b58c8f: merge in lmp-mr1-sdk-release history after reset to lmp-mr1-ub-dev

* commit 'b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b':
  fix build
  fix build