merge in mnc-release history after reset to mnc-dev
The Android Automerger [Thu, 23 Jul 2015 08:03:49 +0000 (01:03 -0700)]

Trivial merge