merge in lmp-mr1-release history after reset to 59a02860a4

This commit is contained in:
The Android Automerger 2014-10-15 06:09:02 -07:00
commit 466c8cbd50

Diff Content Not Available