Doris Ling 079738a26a Merge "Rename settings category." into pi-dev am: a44d07c10d ...

am: 374d15333f

Change-Id: Ic6b4980793aa8360b156fc11e36e79e1ba1f6635

2018-05-11 16:01:38 -07:00

..

anomaly-tester

Merge "AnomalyTester: Remove dependency on bouncycastle."

2018-02-23 17:36:59 +00:00

robotests

Merge "Rename settings category." into pi-dev am: a44d07c10d

2018-05-11 16:01:38 -07:00

uitests

The Google specific bits should not in AOSP tests.

2018-04-17 10:46:15 +00:00

unit

Merge "OMS: rebase settings when overlays update" into pi-dev am: 203b7b1792

2018-05-11 11:53:09 -07:00

Android.mk

…