| commit | b3c4365d10047eae367b529d98d5a90d052f6393 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Oct 12 19:04:17 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 12 19:04:17 2010 -0700 |
| tree | 2d40a0530a06f937b48def706cdd2b86d3b1967f | |
| parent | 52e8542d9dfb9c0d9a3530df1d790a0275d27f31 [diff] | |
| parent | cd99332fee649afd85798499cea5c45a098b8a20 [diff] |
am cd99332f: Merge "Update settings app for new NFC API." into gingerbread Merge commit 'cd99332fee649afd85798499cea5c45a098b8a20' into gingerbread-plus-aosp * commit 'cd99332fee649afd85798499cea5c45a098b8a20': Update settings app for new NFC API.