merge in lmp-mr1-release history after reset to 5acc751ffe

This commit is contained in:
The Android Automerger 2014-10-09 06:10:56 -07:00
commit 488dded468

Diff Content Not Available