am 0c4c3a3e: Merge "Kill MyTagActivity and merge it into EditTagActivity. (making way for a new MyTagActivity that is the list and  manager for MyTag)" into gingerbread

* commit '0c4c3a3e9db3cea445937fbe739df2334a143240':
  Kill MyTagActivity and merge it into EditTagActivity. (making way for a new MyTagActivity that is the list and  manager for MyTag)
tree: f90af12de7337572a2fd3bd2421721d85aa9b634
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml