Merge commit 'cb41da28' into manualmerge
Ben Komalo [Fri, 21 Jan 2011 19:20:50 +0000 (11:20 -0800)]
Also resolve some differences that shouldn't be there
this branch should match almost exactly with commit
cb41da281717599.

Conflicts:
AndroidManifest.xml
src/com/android/apps/tag/EditTagActivity.java
src/com/android/apps/tag/provider/TagDBHelper.java

Change-Id: Ia83b895c16447a70bd73228dbf0c98f728519c8c

1  2 
src/com/android/apps/tag/MyTagList.java