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

This commit is contained in:
The Android Automerger 2014-10-26 06:08:41 -07:00
commit fa29966094

Diff Content Not Available