am a46b8b66: am 4f6f93d5: Merge "Checkpoint work on the Tag app." into gingerbread

Merge commit 'a46b8b664ade966e0a0cd3b5e26b184297e2744c'

* commit 'a46b8b664ade966e0a0cd3b5e26b184297e2744c':
  Checkpoint work on the Tag app.