diff options
| author | Nick Pelly <npelly@google.com> | 2010-12-10 17:19:45 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-12-10 17:19:45 -0800 |
| commit | 0ee0b922028407db155f91ae7f45883190fa1ddf (patch) | |
| tree | 560b5dcb1a3b1dc694a176dd7fca8e7c63f77414 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 35ff21301ede4d7a2c7ccf652c4d5a8c9576e1d5 (diff) | |
| parent | 3cb8da45a2d3bc5ee89f320cb0ab707848cee3f5 (diff) | |
am ae56a851: Merge "Make getSystemService(NFC_SERVICE) the NFC entry point." into gingerbread
* commit 'ae56a851624c2b2e78da8a2c339d2caa64c4f981':
Make getSystemService(NFC_SERVICE) the NFC entry point.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions