merge in lmp-mr1-release history after reset to 445111a1c977e94a4233efd54f3690defa4a7582

This commit is contained in:
The Android Automerger 2014-11-02 06:08:55 -08:00
commit b0daba3da1

Diff Content Not Available