resolved conflicts for merge of be1cf84f to master
Jason Chen [Thu, 4 Nov 2010 17:48:22 +0000 (10:48 -0700)]
Change-Id: I4ba4c1c54a301e05d204a1c8ef2cf45557974046

1  2 
src/com/android/apps/tag/provider/TagDBHelper.java