tree 4e180924564fa3fadd8278e9dd3690516fccb123
parent c4c38db6022999b6e1656fb606d3282a233d2411
parent 42cfd96a4b97dee73dc51a0265245e3c7137caf2
author Trevor Johns <trevorjohns@google.com> 1432760052 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1432760052 +0000

Merge changes I2f42d5a3,I99c99292 into mnc-dev

* changes:
  Rename ActiveNotification to ActiveNotifications
  Rename 'AutomaticBackup' to 'AutoBackupForApps'