Chris Wren 1532feb580 am ec8763a9: Merge "Manage heads up state during notification update." into lmp-preview-dev ...

* commit 'ec8763a994a9d08cb40f47fa82f35e75a032e5a5':
  Manage heads up state during notification update.

2014-06-12 20:05:55 +00:00

..

res

resolved conflicts for merge of 6edef668 to master

2014-06-12 22:02:32 +02:00

src/com/android/systemui

am ec8763a9: Merge "Manage heads up state during notification update." into lmp-preview-dev

2014-06-12 20:05:55 +00:00

tests

…

Android.mk

Make Keyguard a library and make StatusBar the new Keyguard.

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

AndroidManifest.xml

QuickSettings: Use connectivity manager for airplane mode.

2014-05-23 12:59:27 -04:00

lint.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Removing unnecessary proguard flag for removed info view.

2014-05-21 00:31:43 +00:00