Bonian Chen cacf047daa [Settings] Fix conflict of AOSP merge on wifi call ...

Merge for fixing conflict of Ib4b0e1191c83e23377ccf8ed013252728ef9dd95

Bug: 144960427
Test: build pass
Change-Id: I2979a9a2ee1bc690486e25b7d470cf905cf02d17
Merged-In: Idb063bdab3d3b11c348804c1c0ecb268cca3068e

2019-11-22 20:38:13 +00:00

..

anomaly-tester

Convert Settings to Android.bp

2019-05-29 14:45:30 -07:00

robotests

[Settings] Fix conflict of AOSP merge on wifi call

2019-11-22 20:38:13 +00:00

uitests

Convert Settings to Android.bp

2019-05-29 14:45:30 -07:00

unit

Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"

2019-10-01 03:03:36 -07:00