| commit | 886fd91833e1f5c6ec882baf2ed5e02078911c63 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Thu Oct 21 13:50:09 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 13:50:09 2010 -0700 |
| tree | 08b0c0a29ad27fb1e309795d16a80545349af84d | |
| parent | 9509527eb609e8523408107ade74ac6be738f5e1 [diff] | |
| parent | c0e93a849f82c97b847c9ad39b18e594f3bb3f5a [diff] |
am c0e93a84: am 7ea5c45e: NFC settings cleanup. Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a' * commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a': NFC settings cleanup.