merge in lmp-mr1-release history after reset to 02542b3bbd

This commit is contained in:
The Android Automerger 2014-10-06 06:08:57 -07:00
commit 26df9bf109

Diff Content Not Available