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

This commit is contained in:
The Android Automerger 2014-10-28 06:13:58 -07:00
commit 515a28f582

Diff Content Not Available