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

This commit is contained in:
The Android Automerger 2014-10-14 06:11:29 -07:00
commit aeb3f1d837

Diff Content Not Available