merge in mnc-release history after reset to mnc-dev
The Android Automerger [Tue, 4 Aug 2015 08:03:09 +0000 (01:03 -0700)]

Trivial merge