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

This commit is contained in:
The Android Automerger 2014-10-01 06:13:06 -07:00
commit 6560c5f0df

Diff Content Not Available