merge in lmp-mr1-release history after reset to 653263a964

This commit is contained in:
The Android Automerger 2014-11-01 06:09:02 -07:00
commit 13baf92d93

Diff Content Not Available