| commit | 5bc8c853f5f8118b172bb4651aba58fd254c3cb7 | [log] [tgz] |
|---|---|---|
| author | Nick Pelly <npelly@google.com> | Tue Oct 19 09:53:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 19 09:53:03 2010 -0700 |
| tree | 4eda6b25a9733fa8f63b203fdf6a22bb623b36b7 | |
| parent | c46b2a7b591a02bb6beeb2f62c7e571588ca6aa9 [diff] | |
| parent | c2e4daacb4470bd43d5db3cf6b82f39be757ebe8 [diff] |
am c2e4daac: am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread Merge commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8' * commit 'c2e4daacb4470bd43d5db3cf6b82f39be757ebe8': Prevent use of NFC api if device is not featurized for NFC.