diff options
| author | Nick Pelly <npelly@google.com> | 2010-10-18 15:23:17 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-18 15:23:17 -0700 |
| commit | 5a989fc34354b9f62715ee05199a79852f2a4828 (patch) | |
| tree | ccc2e69bb92259cb595ebc0359809599dcc39cbe /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b78ea998ebeb14f19b86e77606fdb495d73857fd (diff) | |
| parent | 77371310a6b0c86295eeb3dec63b58a006b4cd8f (diff) | |
am 2b51fcb9: Merge "NFC: broadcast intent constants for adapter state change" into gingerbread
Merge commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa' into gingerbread-plus-aosp
* commit '2b51fcb9ac80c7c42be8f53763773414ba9ca4fa':
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