Merge remote-tracking branch 'goog/ics-aah'
[android/platform/packages/apps/Tag.git] /
-rw-r--r-- Android.mk
-rw-r--r-- AndroidManifest.xml
drwxr-xr-x canon
drwxr-xr-x res
drwxr-xr-x src