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

This commit is contained in:
The Android Automerger 2014-11-09 08:05:02 -08:00
commit d30c112e01

Diff Content Not Available