OSDN Git Service

Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev
authorNaina Nalluri <nainanalluri@google.com>
Mon, 14 May 2018 22:59:11 +0000 (22:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 14 May 2018 22:59:11 +0000 (22:59 +0000)
commit15602b3f48f3a3d52692eba74e9cd29ef2e3916d
tree4f7260f085632ceab7bc3ef9559d733d2a4bd5a4
parent7fe599f542fbfa4be6925e203ee490997e581f76
parente6bf71abedb8da622b634fd8e19cf3ac9cd999b2
Merge "DO NOT MERGE Add Slices for WifiCalling" into pi-dev
res/values/strings.xml
src/com/android/settings/slices/SettingsSliceProvider.java