Lei Yu 73c361b544 Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp" ...

This reverts commit e81224d80c.

Reason for revert: broke pi-dev-plus-aosp

Change-Id: Ib45b96216017d01b6301a558a0cd27bf1071779c
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389

2018-10-29 20:35:24 +00:00

..

anomaly-tester

Merge "AnomalyTester: Remove dependency on bouncycastle."

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

robotests

Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp"

2018-10-29 20:35:24 +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

…