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

This commit is contained in:
The Android Automerger 2014-11-17 06:09:15 -08:00
commit fa06d6dba7

Diff Content Not Available