Merge "Update to the new NFC APIs." into gingerbread
authorJeff Hamilton <jham@android.com>
Fri, 21 Jan 2011 19:34:33 +0000 (11:34 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 21 Jan 2011 19:34:33 +0000 (11:34 -0800)
commit89b3e169131e8552e91eebd745ec3cd704290761
tree6a7427586f7880adc462057207ea88704d79347f
parentaf4f4cb8d5d3592a74fc0676e38770193e48ae0b
parent42aa0294878b9f98ef5357c31e942b9e0996b6f8
Merge "Update to the new NFC APIs." into gingerbread