John Spurlock 7534df88fc resolved conflicts for merge of 286291bf to master ...

Change-Id: Ied118f11f0a070b610e4edc4695a07418dcf7ce9

2013-10-25 17:01:46 -04:00

..

res

Import translations. DO NOT MERGE

2013-10-23 18:01:15 -07:00

src/com/android/systemui

resolved conflicts for merge of 286291bf to master

2013-10-25 17:01:46 -04: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

…