merge in mnc-release history after reset to mnc-dev rel-24-foster-r2-partner rel-24-foster-r7-partner rel-24-sb-r1-1-partner rel-24-sb-r1-2-partner rel-24-sb-r1-partner
The Android Automerger [Thu, 6 Aug 2015 08:03:27 +0000 (01:03 -0700)]

Trivial merge