Merge commit '1a6913ed' into manualmerge
authorBen Komalo <benkomalo@google.com>
Sat, 22 Jan 2011 00:08:41 +0000 (16:08 -0800)
committerBen Komalo <benkomalo@google.com>
Sat, 22 Jan 2011 00:09:37 +0000 (16:09 -0800)
commitd6c14fd06605f945317655e28a59ef74cf35625e
tree93f1507fa959ecba49b52a5f666c2ed0287b2a61
parentd93396e8b7cffe958ea91077643a6fb0d4bca364
parent1a6913ede1470fc2c7828e912190b50c19f9a3e2
Merge commit '1a6913ed' into manualmerge

Conflicts:
src/com/android/apps/tag/MyTagList.java

Change-Id: I104007cfc868752088484eff11d7b947be8e8e37