Jason Monk 0b99402f87 resolve merge conflicts of de0c539dd4 to oc-mr1-dev ...

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

2017-08-08 16:27:14 -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 de0c539dd4 to oc-mr1-dev

2017-08-08 16:27:14 -04:00

Android.mk

Disable proguard for PluginDummyLib

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

AndroidManifest.xml

…