Dianne Hackborn 6b592723c9 resolved conflicts for merge of f51ded0f to master ...

Change-Id: Ida356524a68aeb2b9b0013dfbb6ab4bd11e616e2

2011-06-10 12:45:36 -07:00

..

assets/fonts

…

res

resolved conflicts for merge of f51ded0f to master

2011-06-10 12:45:36 -07:00

src/com/android/systemui

am 8297f669: am 3aabdeac: am 5ba2e872: Merge "Fix for not reporting correct "sw" in compat mode." into honeycomb-mr2

2011-06-09 18:42:55 -07: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

…