summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorZoey Chen <zoeychen@google.com>2021-08-27 03:38:12 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2021-08-27 03:38:12 +0000
commitac2c9b457625c7741b98d1663011b82d6cb93c47 (patch)
tree5e40a0d8f11c0552f6a3ab48b14e1764b21d60fa /core/java/android
parentd1436f183bc2c60c3fe41d6e46a9b8dddd17075e (diff)
parentfc0d0bc3f50ffd1d3a4bd7705381e7f6063a48cc (diff)
Merge changes I61c32c74,I505c9b04,I5c19e6a8,I24e86a75 into sc-v2-dev
* changes: [RESTRICT AUTOMERGE] [Provider Model] Support 2+ lines instead of marque for Mobile data and Wi-Fi [RESTRICT AUTOMERGE] [Provider Model] Fix WiFi SSID disappear issue [RESTRICT AUTOMERGE] [Provider Model] Enforce DISALLOW_CONFIG_WIFI in Internet Panel [RESTRICT AUTOMERGE] [Provider Model] Correct Wi-Fi toggle title color in Dark Theme
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions