diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-21 16:05:30 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-21 16:05:30 -0800 |
| commit | 4fb747f329523d6b3a7efc59a4360a249cdaa5ad (patch) | |
| tree | 2ac9be34d2f13d9294eac494b6081ba9f9c84bf4 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8b8c321c70687ace750e42b745b6e96258d739cd (diff) | |
| parent | 043a8b149dc31d3e3242ccf0cadc580702c99552 (diff) | |
am 043a8b14: Merge "Replace vendor specific NfcGoogle.apk with generic Nfc.apk" into ics-mr1
* commit '043a8b149dc31d3e3242ccf0cadc580702c99552':
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