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

This commit is contained in:
The Android Automerger 2014-10-08 06:13:14 -07:00
commit 059c6ea2ce

Diff Content Not Available