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

This commit is contained in:
The Android Automerger 2014-11-10 06:10:56 -08:00
commit 1e7441e64f

Diff Content Not Available