tree 1a335d4cdbdffc9db1619112a02dbcfd77812099
parent bf38e48333c1f79758a229c8a0258679323b2ccc
parent 33c44f267aa8482863a222b2e8b7fc98edd43416
author Jeff Hamilton <jham@android.com> 1287768006 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1287768006 -0700

Merge "Unhide some NFC APIs that are required for the Tag app." into gingerbread