| commit | 2a0ba6a3fc943fa7e0a1824408b296e914619151 | [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 | c685fa8ab78db41df2442a266e02d0197417086b | |
| parent | a5ba0d9ffab64407469d6a99c9e92f7bae169e44 [diff] | |
| parent | 86d7998cf75756c20b44ba813c83adb73a447669 [diff] |
am dc54a8c7: Merge "API changes for NFC." into gingerbread * commit 'dc54a8c742e96d6ea8ef3e18c0f2ee1235899599': API changes for NFC.