tree bc24c5d470a0b30508cfb49101d097e762d01871
parent 0592832c5e61b9c0008a4410f263ea0b0b991f05
parent da83f513ca661cd2bb1e6f1c8b64b716205bae48
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