am c0b377e6: Merge gingerbread-nfc into gingerbread.
Nick Pelly [Mon, 6 Dec 2010 18:43:08 +0000 (10:43 -0800)]
* 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."

1  2 
AndroidManifest.xml
res/values/strings.xml

Simple merge
Simple merge