resolved conflicts for merge of be1cf84f to master
authorJason Chen <jasonchen@google.com>
Thu, 4 Nov 2010 17:48:22 +0000 (10:48 -0700)
committerJason Chen <jasonchen@google.com>
Thu, 4 Nov 2010 17:48:22 +0000 (10:48 -0700)
commit2d164efd733204f6ffab714c80e51eb619164b8c
tree95aaf831e8534922a6938a3ccf30255061650fb1
parent32a21d35b45f9ed56c1fd1026651b7bc61654f7d
parentbe1cf84fc4bea9291ec5c094d030b6c6fb112884
resolved conflicts for merge of be1cf84f to master

Change-Id: I4ba4c1c54a301e05d204a1c8ef2cf45557974046
src/com/android/apps/tag/provider/TagDBHelper.java