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

Trivial merge