diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-04 18:27:27 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-04 18:27:27 -0700 |
| commit | e26f5e72cf0e3dc88beae201d8d671392f45325a (patch) | |
| tree | ad0f6e6006ddeb3b24e08d56646d0aa340825607 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 910e71b6f4d4e79ab3096bef3a4ebad95f04095c (diff) | |
| parent | 377bf20f7977770b266e39da86f1aade0b094d4a (diff) | |
am 15f107b1: Merge "New API stubs: NdefMessage and NdefRecord." into gingerbread
Merge commit '15f107b151deff1f25f1255bdbcb630ed576ac8d' into gingerbread-plus-aosp
* commit '15f107b151deff1f25f1255bdbcb630ed576ac8d':
New API stubs: NdefMessage and NdefRecord.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions