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

Trivial merge