tree d773639dfaaf0127283b4494f54a74d44a1e324a
parent 58afc3547e1b05175153a20d8d340ce3ee97ba7d
parent aae99eaa148ad74efbcd1519cc34363823e3c560
author The Android Automerger <android-build@google.com> 1427404787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427404787 +0000

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

* commit 'aae99eaa148ad74efbcd1519cc34363823e3c560':
  fix build
  fix build