tree 1d690e8c388d2896eb76d61410284fc1858c98ff
parent 73cd4fff52aa8fb8f89aeef28bda8b0368b7fc4b
parent d1f7f4a68375f879671d300510f23d3ee78a500e
author Nick Pelly <npelly@google.com> 1287363020 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287363020 -0700

am d1f7f4a6: Move hidden API\'s Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.

Merge commit 'd1f7f4a68375f879671d300510f23d3ee78a500e' into gingerbread-plus-aosp

* commit 'd1f7f4a68375f879671d300510f23d3ee78a500e':
  Move hidden API's Llcp* and P2p* to f/b/c/j/com/android/internal/nfc.