merge in lmp-mr1-release history after reset to 70ec294153

This commit is contained in:
The Android Automerger 2014-10-29 06:10:44 -07:00
commit 8fd04be3f3

Diff Content Not Available