Bonian Chen ec4e1a14e0 Merge "[Setting] Fix merge conflict" ...

am: 67805d8e5e

Change-Id: Ie7f67b9a80efdceb1e3c5fd3054dd4eb71c4dcd8

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

..

anomaly-tester

Convert Settings to Android.bp

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

robotests

Merge "[Setting] Fix merge conflict"

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