diff options
| author | Martijn Coenen <maco@google.com> | 2011-11-10 21:50:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 21:50:21 +0000 |
| commit | 7ee88289091f8bc81dabeff62f215ba21baa8c0b (patch) | |
| tree | 2a6c33f6d08434ba5632cc0ba581cf217448bed9 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 68a15583f7438c687e3b029f83cf80ca7827ff31 (diff) | |
| parent | c5f3fd6ef160c0f6072b14b97aa5c1d9759c682e (diff) | |
am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1
* commit 'c5f3fd6ef160c0f6072b14b97aa5c1d9759c682e':
Revert "Remove deprecated (hidden) enableForegroundNdefPush API's." (DO NOT MERGE).
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions