merge in lmp-mr1-release history after reset to 16410d458f

This commit is contained in:
The Android Automerger 2014-10-12 06:10:26 -07:00
commit fa5593f60a

Diff Content Not Available