diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-17 12:51:18 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 12:51:18 -0800 |
| commit | 637742c34e9db537260bfbd02b461218d2a8f214 (patch) | |
| tree | 6612a4783a0af5dacf89a520c8ea80420dc0103b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c1bb1bc3645563bb86f00969031d6e0a705dce8c (diff) | |
| parent | 3d1e8f0610bf09ca6eca0f04bb7a382f1aed55c3 (diff) | |
am 63b7360e: Merge "Fix NPE on devices that don\'t have NFC." into ics-mr1
* commit '63b7360e9d8c6fb077bdd00c7ef08f402d5a76ba':
Fix NPE on devices that don't have NFC.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions