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

This commit is contained in:
The Android Automerger 2014-09-27 06:11:32 -07:00
commit 6a0a0fe0f7

Diff Content Not Available