merge in mnc-release history after reset to mnc-dev
The Android Automerger [Mon, 13 Jul 2015 08:00:18 +0000 (01:00 -0700)]

Trivial merge