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

Trivial merge