merge in mnc-release history after reset to mnc-dev
The Android Automerger [Sat, 25 Jul 2015 08:06:30 +0000 (01:06 -0700)]

Trivial merge