diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-21 21:08:29 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 21:08:29 -0800 |
| commit | 082ccca5ff36568b513a317a0dc72c05868cfc9f (patch) | |
| tree | 679c7a51d240965e18d15e8bb554704d906a462e /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 08b7660f67277db234f24a6e9cb0be172e81558d (diff) | |
| parent | 4fb747f329523d6b3a7efc59a4360a249cdaa5ad (diff) | |
am 4fb747f3: am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '4fb747f329523d6b3a7efc59a4360a249cdaa5ad':
Replace vendor specific NfcGoogle.apk with generic Nfc.apk
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions