commit | 54770496d393385408cfba3198f87e139712ed94 | [log] [tgz] |
---|---|---|
author | Nick Pelly <npelly@google.com> | Mon Oct 18 16:42:18 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 18 16:42:18 2010 -0700 |
tree | 2d43ef5be3b8629804ae56ac154ad96b68f7e687 | |
parent | c5469bd67abb13321ed0e1a8a08d0f8478fd4c43 [diff] | |
parent | 6b09a90a818137de52a0c7325339849ccf584b9e [diff] |
am 6b09a90a: am e47150e9: Fix up NFC permissions. Merge commit '6b09a90a818137de52a0c7325339849ccf584b9e' * commit '6b09a90a818137de52a0c7325339849ccf584b9e': Fix up NFC permissions.