diff options
author | Nick Pelly <npelly@google.com> | 2011-10-31 22:09:10 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-31 22:09:10 -0700 |
commit | 2aff47360066b326b6616d3b241e133f45e5434e (patch) | |
tree | 1d90b398fb949e1e316b658c863f2f87f7814afb /opengl/tests/gl_basic/gl_basic.cpp | |
parent | c4f175ac45c6bfab5f3cef219dfb3378d9e7d029 (diff) | |
parent | 240544cbff54e2a99292c5c89f29310e3c9a6d17 (diff) |
Merge "API Change: add isNdefPushEnabled() & ACTION_NFC_SETTINGS."
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions