merge in mnc-release history after reset to mnc-dev
The Android Automerger [Sat, 15 Aug 2015 08:08:44 +0000 (01:08 -0700)]

Trivial merge