diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-19 09:56:01 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-19 09:56:01 -0700 |
| commit | 85e98899ab8d5d02c16451e2ae139cf65400ad88 (patch) | |
| tree | 4afc4ae360009933b125f1c83294af7beb4e2049 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c2c020f218635dd2669d876e1094b322d9505834 (diff) | |
| parent | 5a989fc34354b9f62715ee05199a79852f2a4828 (diff) | |
am 7dced8de: am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread
Merge commit '7dced8de3813aa42edb59e13e3ea3a2657d06125'
* commit '7dced8de3813aa42edb59e13e3ea3a2657d06125':
NFC: broadcast intent constants for adapter state change
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions