OSDN Git Service

Merge "Add Global Settings to device whether show Carrier menu" into pi-dev
authorQingxi Li <qingxi@google.com>
Tue, 17 Apr 2018 22:46:07 +0000 (15:46 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 17 Apr 2018 22:46:07 +0000 (15:46 -0700)
commit166f56c4cfb872bb04262bd48e4ef07ec25a7417
treef704e7df8ad8c5437f8f7782480f3f52d8dff647
parent7cefde2e83fe8c76ac2359397965ae93c89cce1c
parentff03f0cfe4c1fa8f6c2264ecd307c3bff8b9bfec
Merge "Add Global Settings to device whether show Carrier menu" into pi-dev
am: ff03f0cfe4

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