| commit | 18247d74be9d0d4d6f1ae25bdd198e5dbf522af8 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Tue Apr 05 10:42:19 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 05 10:42:19 2011 -0700 |
| tree | 902a33d6ab3503d54b5c17b2e0b84b79b114acbc | |
| parent | 32e834b63b88f81589b8d70a680bfa15374bf82f [diff] | |
| parent | ee3420bc124613827af474684c3015d12742c70d [diff] |
am ee3420bc: resolved conflicts for merge of 65475f89 to honeycomb-plus-aosp * commit 'ee3420bc124613827af474684c3015d12742c70d': Make the NFC UID forward compatible.