OSDN Git Service

am a3e4293c: am 163bd407: Merge "Added getType() to NDEF technology class (API part...
authorNick Pelly <npelly@google.com>
Tue, 4 Jan 2011 05:03:06 +0000 (21:03 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 Jan 2011 05:03:06 +0000 (21:03 -0800)
* commit 'a3e4293cdc7d09ac93c95d233e4052ac4435773e':
  Added getType() to NDEF technology class (API part).


Trivial merge