merge in lmp-mr1-release history after reset to 027d2717d067c3706f22bf84dc1226ede7c1566d

This commit is contained in:
The Android Automerger 2014-09-22 10:17:00 -07:00
commit 306d80e339

Diff Content Not Available