tree ba3185c79d0a86a0d99d2e6270b2bd3e8b5e2130
parent faebca7f4319950927759163a703dd12f2727460
parent 4bf4b491be3fbd0f71bb87749a0e31f817b91e08
author Nick Pelly <npelly@google.com> 1288365348 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1288365348 -0700

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

* commit '4bf4b491be3fbd0f71bb87749a0e31f817b91e08':
  Hide some NFC API's.