diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-19 09:53:03 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 09:53:03 -0700 |
| commit | 863ab505f7caed358ea844c229420d74d646c120 (patch) | |
| tree | 01d1359a3be31beb124000693824974d0390b309 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7143df4a167d680c1333c63c02c88a6b9256a1d8 (diff) | |
| parent | 2f1d7c3b8e944b3ccb121183bc7c055000d56fe1 (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.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions