diff options
| author | Martijn Coenen <maco@google.com> | 2011-11-10 21:53:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-10 21:53:49 +0000 |
| commit | 5a81e795cf9ec89918d667c045cfb2aaa16c204c (patch) | |
| tree | f3a3950c0854b1963e91cf481a90771b004c90ea /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | f458b3d39aee19f4b1fd0806c0e97cf093c784ab (diff) | |
| parent | 7ee88289091f8bc81dabeff62f215ba21baa8c0b (diff) | |
am 7ee88289: (-s ours) am c5f3fd6e: Merge "Revert "Remove deprecated (hidden) enableForegroundNdefPush API\'s." (DO NOT MERGE)." into ics-mr1
* commit '7ee88289091f8bc81dabeff62f215ba21baa8c0b':
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