merge in mnc-release history after reset to mnc-dev
The Android Automerger [Sat, 27 Jun 2015 08:00:20 +0000 (01:00 -0700)]

Trivial merge