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

This commit is contained in:
The Android Automerger 2014-10-22 06:08:46 -07:00
commit ddedd3a38d

Diff Content Not Available