merge in mnc-dr1.5-release history after reset to mnc-dr1.5-dev

This commit is contained in:
The Android Automerger 2016-03-17 18:36:43 -07:00
commit 4f5381849b

Diff Content Not Available