commit | 6066da89a464d2bd5f002f5e687d40876ed5ce21 | [log] [tgz] |
---|---|---|
author | Nick Pelly <npelly@google.com> | Tue Oct 12 19:00:54 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 12 19:00:54 2010 -0700 |
tree | 161475c32de03e01ae57bd003f3196851f394adc | |
parent | dfd37a4748845273d929f24ae5d68032d19f6216 [diff] | |
parent | 590b73bc5b8e5f7b59bff1d9264a52388a5162e6 [diff] |
am 590b73bc: NFC API revision round 2. Merge commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6' into gingerbread-plus-aosp * commit '590b73bc5b8e5f7b59bff1d9264a52388a5162e6': NFC API revision round 2.