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

Merge commit '4f6f93d594791461d0a1df299800a3b238cdc1fc' into gingerbread-plus-aosp

* commit '4f6f93d594791461d0a1df299800a3b238cdc1fc':
  Checkpoint work on the Tag app.