commit | 888ddb301cf82d7c533ccd263908ee962927ab5c | [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 | 5af3dfc34b36fbee01ad90cb3e58bf582b565c1c | |
parent | 318e1fe73b5fa24d495f0edc5ade0f21fc7e0e52 [diff] | |
parent | 81b5fbfdacbd36b1379638a4bacd55a6ffee3647 [diff] |
am 7ea5c45e: NFC settings cleanup. Merge commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1' into gingerbread-plus-aosp * commit '7ea5c45e8d89f59065f088d4e11cceeeed9d64d1': NFC settings cleanup.