Victoria Lease e5bf17eaf8 resolved conflicts for merge of 25208987 to master ...

Change-Id: If900fc2d9892f3ff743d94cb209780047da0110f

2014-05-23 13:10:33 -07:00

..

res

Decreased shadows between notifications slightly.

2014-05-23 14:59:51 +02:00

src/com/android/systemui

resolved conflicts for merge of 25208987 to master

2014-05-23 13:10:33 -07:00

tests

…

Android.mk

…

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