resolved conflicts for merge of c749051b to honeycomb-plus-aosp
authorBen Komalo <benkomalo@google.com>
Fri, 7 Jan 2011 18:27:03 +0000 (10:27 -0800)
committerBen Komalo <benkomalo@google.com>
Fri, 7 Jan 2011 18:27:03 +0000 (10:27 -0800)
commitcbe920e8f0649ee5a47473abbf658cb65e4c48b7
treea3cfd1aa6a9c217e3943114ffbe16c254a21db92
parent658568f79885ac7d1eb2dab57c8cdce663c4834a
parentc749051bc7e3f15301f9c1fcd58541f2bc9b7c07
resolved conflicts for merge of c749051b to honeycomb-plus-aosp

Change-Id: I63760c0d58376b6cdcc4f71ebcd701e6cca9240d
src/com/android/apps/tag/EditTagActivity.java
src/com/android/apps/tag/MyTagList.java