merge in lmp-mr1-release history after reset to 71e351d96b

This commit is contained in:
The Android Automerger 2014-09-28 06:10:26 -07:00
commit 7fe8b2b7d6

Diff Content Not Available