Eric Fischer 3124e6ebe7 Merge "Import revised translations."

2011-06-03 10:22:58 -07:00

..

assets/fonts

…

res

Merge "Import revised translations."

2011-06-03 10:22:58 -07:00

src/com/android/systemui

resolved conflicts for merge of 7e2181c0 to master

2011-06-03 10:26:15 +09:00

Android.mk

…

AndroidManifest.xml

DO NOT MERGE: Backport more USB accessory changes from honeycomb

2011-03-15 16:50:18 -04:00

MODULE_LICENSE_APACHE2

…

NOTICE

…

proguard.flags

…