OSDN Git Service

Merge "Add Call Redirection Default Application in Settings" am: b7c0727c15
authorsqian <shuoq@google.com>
Tue, 9 Oct 2018 18:47:46 +0000 (11:47 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 9 Oct 2018 18:47:46 +0000 (11:47 -0700)
commit846b2d1920a056abae6381615a487bbe5accc876
tree622e05418d8d14fe694d5cd89171dd22f3bf2e8a
parentca7411c0e9b2d4b165b8dfe0b0f5d08e936986a7
parent936791f53680ed91d624e4c66530f0cb32d9c386
Merge "Add Call Redirection Default Application in Settings" am: b7c0727c15
am: 936791f536

Change-Id: Ibf6554de156ec0e4d7fa9dc46eb8eee216857188
core/java/android/provider/Settings.java
core/tests/coretests/src/android/provider/SettingsBackupTest.java