tree 64a65acf4e5511e1d4a671ea41f46593980bf21b
parent e818577ef0262cbc43b517a2368a20963543402f
parent 4cc05cf955a151527d64b77f001aea7881888ded
author Nick Pelly <npelly@google.com> 1288365628 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288365628 -0700

am ba1664b3: am 4bf4b491: Merge "Hide some NFC API\'s." into gingerbread

* commit 'ba1664b34cc33ebb6b45fccedb35298ff8b1d998':
  Hide some NFC API's.