Doris Ling 0fbf0fd198 Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev ...

am: f230f4f9ad

Change-Id: I24c3976e863e1a9db02dbf1fee07358e52b72269

2016-07-01 20:33:11 +00:00

..

com/android/settings

Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev

2016-07-01 20:33:11 +00:00