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

This commit is contained in:
The Android Automerger committed 2015-02-03 09:05:59 -08:00
commit b2b58c8f6c

Diff Content Not Available