| commit | 525f953bb119fac27a877b0e56e4bc7777df70f5 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Jan 06 20:28:52 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 06 20:28:52 2011 -0800 |
| tree | 0ab2a0bf37cdf071af8113fc227271631e635888 | |
| parent | 97b0b7bbd41bf3bc6095a513c329e1143300ec3a [diff] | |
| parent | 0aea1836152da049273e581051a878381dcbd73d [diff] |
am 0aea1836: Merge "Make the new NFC APIs public." into gingerbread * commit '0aea1836152da049273e581051a878381dcbd73d': Make the new NFC APIs public.