| commit | 064a7f0ad82d17d09776cd11ed46060b0edbfb27 | [log] [tgz] |
|---|---|---|
| author | Megha Joshi <mjoshi@google.com> | Fri Nov 12 18:34:19 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 12 18:34:19 2010 -0800 |
| tree | 52c39218de778bfd3ba1f9f4fb67491b927fbdd0 | |
| parent | 3087c65b7cac2554e7fad6beff563e78c6d40354 [diff] | |
| parent | d53c6f2ac325f6e06a94f751817a9ecdfa4eb7f1 [diff] |
am d53c6f2a: (-s ours) am 7f39ff80: Merge "NFC sample app (DO NOT MERGE)" into gingerbread * commit 'd53c6f2ac325f6e06a94f751817a9ecdfa4eb7f1': NFC sample app (DO NOT MERGE)