am c0b377e6: Merge gingerbread-nfc into gingerbread.
authorNick Pelly <npelly@google.com>
Mon, 6 Dec 2010 18:43:08 +0000 (10:43 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 6 Dec 2010 18:43:08 +0000 (10:43 -0800)
commit4ecf9a12f44caea5c6bd7d0d03c03afc65cd9c28
tree3753a23f6acda2bef7bfc81d7e1d7ecf08cd5a95
parentb16378283e1a1dab1da8e9f8301711adc60eda08
parentc0b377e6cb06de7511d052c3a5693655e82dcfb7
am c0b377e6: Merge gingerbread-nfc into gingerbread.

* commit 'c0b377e6cb06de7511d052c3a5693655e82dcfb7':
  Revert "Merge "Remove manifest refernece to My Tag activity." into gingerbread"
  Stop sending fake tags via the cannon.
  Revert "Remove the My Tag feature."
AndroidManifest.xml
res/values/strings.xml