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

This commit is contained in:
The Android Automerger 2014-09-23 04:46:25 -07:00
commit 15e2cff615

Diff Content Not Available