Bonian Chen 42eec15834 Merge "[Setting] Fix merge conflict" am: 67805d8e5e ...

am: ec4e1a14e0

Change-Id: I716436a78316eb111fa53bb6834d81934f7830f1

2019-11-26 02:11:19 -08:00

..

anomaly-tester

Convert Settings to Android.bp

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

robotests

Merge "[Setting] Fix merge conflict" am: 67805d8e5e

2019-11-26 02:11:19 -08: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