merge in lmp-mr1-release history after reset to 8ad8c0a775

This commit is contained in:
The Android Automerger 2014-10-23 06:12:15 -07:00
commit a9ba83829e

Diff Content Not Available