tree 161475c32de03e01ae57bd003f3196851f394adc
parent dfd37a4748845273d929f24ae5d68032d19f6216
parent 590b73bc5b8e5f7b59bff1d9264a52388a5162e6
author Nick Pelly <npelly@google.com> 1286935254 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286935254 -0700

am 590b73bc: NFC API revision round 2.

Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp

* commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6':
  NFC API revision round 2.