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

Trivial merge