Jeff Brown b530aeb0fe resolved conflicts for merge of f0b9ee96 to master ...

Change-Id: I1b347e895049474e11076c60074dc5918cfe1405

2013-11-11 16:10:53 -08:00

..

res

am 40c81e4a: am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev

2013-11-11 15:23:40 -08:00

src/com/android/systemui

resolved conflicts for merge of f0b9ee96 to master

2013-11-11 16:10:53 -08:00

tests

…

Android.mk

…

AndroidManifest.xml

Put DessertCase on a diet.

2013-10-15 00:34:10 -04:00

lint.xml

…

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

Keep PhoneStatusBar default constructor around.

2013-09-23 11:15:11 -04:00