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

Trivial merge