am 3da05cbf: (-s ours) am 0c7b1b05: (-s ours) Merge "Import translations. DO NOT...
[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