OSDN Git Service

Merge \"Update Backup & reset settings to launch the configured activity.\" into...
authorDoris Ling <dling@google.com>
Fri, 1 Jul 2016 20:33:11 +0000 (20:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 1 Jul 2016 20:33:11 +0000 (20:33 +0000)
commit0fbf0fd198a0c748766452b0faeb8b8d7b308fea
tree6407a941ee59579d9685f8cb4c573736044b1931
parent0e2e73840096e839a06a136fb2822b3e2ef1e4ad
parentf230f4f9ad469906db43b9351bc6d9f76cf0ef82
Merge \"Update Backup & reset settings to launch the configured activity.\" into nyc-mr1-dev
am: f230f4f9ad

Change-Id: I24c3976e863e1a9db02dbf1fee07358e52b72269
AndroidManifest.xml
src/com/android/settings/SettingsActivity.java