diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-18 12:04:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 12:04:16 -0700 |
| commit | 2f1d7c3b8e944b3ccb121183bc7c055000d56fe1 (patch) | |
| tree | 019ca26084abbcccb357df956b5df2b574c4e8e2 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c283c2e2c5ee492ce56aabb5d70a98bee403cf37 (diff) | |
| parent | 8a1c39374ca30e3aa8af6a96b81f2bddb3fb6ba2 (diff) | |
am 1f90908c: Merge "Prevent use of NFC api if device is not featurized for NFC." into gingerbread
Merge commit '1f90908c19ab24791bd54c856b32bb12682496eb' into gingerbread-plus-aosp
* commit '1f90908c19ab24791bd54c856b32bb12682496eb':
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