diff options
| author | Martijn Coenen <maco@google.com> | 2011-11-01 21:59:16 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-01 21:59:16 +0000 |
| commit | 3a333712a9de29584fd9a2653e89209f98b1b630 (patch) | |
| tree | 1d90b398fb949e1e316b658c863f2f87f7814afb /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | a940a14b5e87608c4a64416940d00aae6d73d308 (diff) | |
| parent | 62d73132c48a866596b8fd384a41406f3577f9ee (diff) | |
am b288f993: am 1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
* commit 'b288f99334348a21ffb465b37a4522998b452410':
Fix disableForegroundNdefPush crash.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions