merge in lmp-mr1-release history after reset to 2e5f8eaa7d

This commit is contained in:
The Android Automerger 2014-10-13 06:11:18 -07:00
commit 4b482de115

Diff Content Not Available