Jason Monk d7dab0f36f resolve merge conflicts of a5b457b3bf to oc-dr1-dev ...

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

2017-06-08 13:00:40 -04:00

..

ExamplePlugin

New system for versioning sysui plugins

2017-02-09 09:32:20 -08:00

src/com/android/systemui/plugins

resolve merge conflicts of a5b457b3bf to oc-dr1-dev

2017-06-08 13:00:40 -04:00

Android.mk

Disable proguard for PluginDummyLib

2017-03-23 18:08:41 -07:00

AndroidManifest.xml

…