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

This commit is contained in:
The Android Automerger 2014-09-29 06:15:46 -07:00
commit 2facb0115e

Diff Content Not Available