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

Trivial merge