| commit | 1ff9ad3fb4947c458eaf4a99f0cd32834ee53943 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Sep 28 22:34:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 28 22:34:42 2010 -0700 |
| tree | 75df698bd4b13676f728a22c80da5bc58f2c7752 | |
| parent | e2ab45972af13c30bb98848813313603670c8965 [diff] | |
| parent | 48ad5dfe3189534cc3c9b8cb6f84758db19524c4 [diff] |
am 48ad5dfe: Merge "Add NFC checkbox to Settings app." into gingerbread Merge commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4' into gingerbread-plus-aosp * commit '48ad5dfe3189534cc3c9b8cb6f84758db19524c4': Add NFC checkbox to Settings app.