tree 590c5e2a0736509919644d0254ea2b887ea10926
parent 2b03173b27c7cd9daaa4f06c1f56a45b754eb5fc
parent 4f6f93d594791461d0a1df299800a3b238cdc1fc
author Jeff Hamilton <jham@android.com> 1287088895 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287088895 -0700

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.