merge in mnc-release history after reset to mnc-dev
The Android Automerger [Mon, 15 Jun 2015 18:57:16 +0000 (11:57 -0700)]

Trivial merge