Stanley Tng 81edd9a286 resolve merge conflicts of b0e99e1472 to stage-aosp-master ...

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953

2018-10-17 18:14:27 +00:00

..

anomaly-tester

Merge "AnomalyTester: Remove dependency on bouncycastle."

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

robotests

resolve merge conflicts of b0e99e1472 to stage-aosp-master

2018-10-17 18:14:27 +00:00

uitests

Update storage wizard to latest UX mocks.

2018-04-08 20:06:27 -06:00

unit

Migrate Settings to androidx.

2018-08-28 16:35:52 -07:00

Android.mk

Change build targets for settings tests

2016-01-21 12:32:15 +00:00