Jason Monk ae3288229a resolve merge conflicts of bfe2580b24 to master ...

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I26ac9227556280df5fdc73a59265370fe859ecb1

2017-09-05 14:56:30 -04:00

..

res/layout

…

src/com/android

resolve merge conflicts of bfe2580b24 to master

2017-09-05 14:56:30 -04:00

Android.mk

Hook up AOD knobs to Settings.Global

2017-08-31 13:20:04 -07:00

AndroidManifest.xml

Fix race condition crash

2017-08-15 09:32:27 -04:00

AndroidTest.xml

Add systemui and notification test to framework-base-presubmit suite.

2017-05-19 13:56:38 -07:00