merge in mnc-release history after reset to mnc-dev
The Android Automerger [Wed, 19 Aug 2015 08:06:08 +0000 (01:06 -0700)]

Trivial merge