| commit | 834735a955e0e3110a3103179b877cd00d8dcd1f | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Thu Oct 21 13:46:55 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 21 13:46:55 2010 -0700 |
| tree | 00f70c3eeb57169ac03f7b56029de645a32ab55b | |
| parent | 0fda1ad88c8da426c1e8e88107b05336d135f4cb [diff] | |
| parent | 029f23c32c9fe0c7f288d383a8704bfa420d4ed0 [diff] |
am 029f23c3: am ff8018dc: Merge "Fix NFC permission." into gingerbread Merge commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0' * commit '029f23c32c9fe0c7f288d383a8704bfa420d4ed0': Fix NFC permission.