commit | 0c5e2b3f1377b3b52c535a1f95899830f5de0347 | [log] [tgz] |
---|---|---|
author | Jeff Hamilton <jham@android.com> | Fri Jan 21 12:33:55 2011 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jan 21 12:33:55 2011 -0800 |
tree | 8f077e1a8f24df47374a92b6468615d0d683df93 | |
parent | 446aea40eb1d22e56366c40316c2f0cf027a097d [diff] | |
parent | dc54a8c742e96d6ea8ef3e18c0f2ee1235899599 [diff] |
am dc54a8c7: Merge "API changes for NFC." into gingerbread * commit 'dc54a8c742e96d6ea8ef3e18c0f2ee1235899599': API changes for NFC.