diff options
| author | Nick Pelly <npelly@google.com> | 2011-03-22 10:14:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 10:14:36 -0700 |
| commit | 7821c1bd81eec41cc8e359de9f544749da4493e8 (patch) | |
| tree | 3df13b324209e6ab022e8508522255c975507533 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | dd9d07bac687f5f3b56abfab7171c66af138ebcc (diff) | |
| parent | 54b76288d40fa47a153ffbc799a3e404f623a998 (diff) | |
am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread
* commit 'e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
NfcAdapterExtras: reset singleton state if initialization fails.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions