merge in lmp-mr1-release history after reset to 5105960d49

This commit is contained in:
The Android Automerger 2014-09-25 06:13:48 -07:00
commit 1635df88c4

Diff Content Not Available