merge in lmp-mr1-release history after reset to aaad548535

This commit is contained in:
The Android Automerger 2014-09-27 06:09:13 -07:00
commit fe054482cc

Diff Content Not Available