commit | c0e93a849f82c97b847c9ad39b18e594f3bb3f5a | [log] [tgz] |
---|---|---|
author | Nick Pelly <npelly@google.com> | Thu Oct 21 09:38:15 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 09:38:15 2010 -0700 |
tree | 795e634e166082ad74609dd8d715899a88e3b6cc | |
parent | 0c55136893849d72ac267f887a841efe845218a1 [diff] | |
parent | 7ea5c45e8d89f59065f088d4e11cceeeed9d64d1 [diff] |
am 7ea5c45e: NFC settings cleanup. Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp * commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1': NFC settings cleanup.