Evan Laird 5331f1982e Merge "GM2 icon updates" into pi-dev ...

am: 733a4b9948

Change-Id: I4d18584f82a418d9b8f7288f509d53ac341d777d

2018-05-11 14:50:07 -07:00

..

res

Merge "GM2 icon updates" into pi-dev

2018-05-11 14:50:07 -07:00

src/com/android/settingslib

Merge "Rename settings category." into pi-dev

2018-05-11 20:49:35 +00:00

tests

Merge "Rename settings category." into pi-dev

2018-05-11 20:49:35 +00:00

Android.mk

Migrate to AAPT2

2018-03-29 10:29:05 -04:00

AndroidManifest.xml

…

common.mk

Migrate to AAPT2

2018-03-29 10:29:05 -04:00

OWNERS

…