merge in mnc-release history after reset to mnc-dev
The Android Automerger [Tue, 16 Jun 2015 08:00:09 +0000 (01:00 -0700)]

Trivial merge