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

* commit 'b2b58c8f6cbed5a1290dd4d541157e68e3b29a1b':
  fix build
  fix build
This commit is contained in:
The Android Automerger authored and Android Git Automerger committed 2015-03-26 21:00:22 +00:00
commit aae99eaa14

Diff Content Not Available