| commit | 26d6e4704a9e514097ad88c04b29a4e8b325344f | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Thu Oct 21 09:37:55 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 09:37:55 2010 -0700 |
| tree | 3b6c5b0a8495c0d5c112aa39486a9bc4c3af2ca8 | |
| parent | 149fec6a899079eba30743e7055834969c138d52 [diff] | |
| parent | 781c0aa21ed1e4a38dc3ec1a5facc7be48386571 [diff] |
am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp * commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571': NFC Settings cleanup.