merge in mnc-release history after reset to mnc-dev
The Android Automerger [Wed, 22 Jul 2015 08:05:41 +0000 (01:05 -0700)]

Trivial merge