merge in lmp-mr1-release history after reset to bf46706f36

This commit is contained in:
The Android Automerger 2014-10-21 06:12:38 -07:00
commit 48ddeb7db7

Diff Content Not Available