Jeff Brown f347bc39fc am 06dec565: Merge "resolved conflicts for merge of 4f8cd188 to master" ...

* commit '06dec5656d75345566fd31a2cfc6bd5c84bf41de':
  Clean up some terminology related to interactive state.

2014-05-02 01:26:29 +00:00

..

res

Import translations. DO NOT MERGE

2014-04-30 10:33:27 -07:00

src/com/android/systemui

resolved conflicts for merge of 4f8cd188 to master

2014-05-01 18:19:31 -07:00

tests

…

Android.mk

Make Keyguard a library and make StatusBar the new Keyguard.

2014-03-28 22:35:03 +01:00

AndroidManifest.xml

Add config resource for disabling KeyguardService

2014-04-22 12:39:26 +09:00

lint.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Adding experiment for app-info pane.

2014-04-14 12:38:47 -07:00