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

This commit is contained in:
The Android Automerger 2014-11-08 06:12:55 -08:00
commit 3ff2d3b27c

Diff Content Not Available