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

This commit is contained in:
The Android Automerger 2014-12-03 06:08:43 -08:00
commit f6f04b82e2

Diff Content Not Available