diff options
| author | Nick Pelly <npelly@google.com> | 2011-07-15 11:20:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-07-15 11:20:44 -0700 |
| commit | 96f1959dfe8f529375efe069c617dad0313fd162 (patch) | |
| tree | ab847cb2abefdd74a208e7bab5a976a7ef5e9362 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bbc21229d7f4770bfd3e18a717521f6b24868d47 (diff) | |
| parent | 5b9b4ebf78ae62142c2955104fec21d831916c65 (diff) | |
am fc00b2ed: am 1bce9e25: am 01588aca: Merge "Preserve invariant that sService is not null (although NfcAdapter.get() can return null)" into gingerbread
* commit 'fc00b2ed4fa64621015b47310b91e937581bd3a3':
Preserve invariant that sService is not null (although NfcAdapter.get() can return null)
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions