Bonian Chen dfba6f8720 [Setting] Fix merge conflict ...

Fix merge conflict for I367ae3a5f97ff92e03312bed6fe37727ae3798ab

Bug: 144960427
Test: build pass
Change-Id: I24d684b4e695e8ab777f2ba7811b93f6028260d9
Merged-In: I5dfb71ceb87a8f658ef7fbceacf460ef8d35593a

2019-11-26 07:20:30 +00:00

..

anomaly-tester

Convert Settings to Android.bp

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

robotests

[Setting] Fix merge conflict

2019-11-26 07:20:30 +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