diff options
| author | Jaikumar Ganesh <jaikumar@google.com> | 2010-09-13 11:52:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-13 11:52:19 -0700 |
| commit | 350354e57242c2eae9f3b4f295955418cb377759 (patch) | |
| tree | 1664382aa17eb82db6f397d535fff7bd57ac2055 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 7be0c0b49786abf358f34c611fbc3b75f357e336 (diff) | |
| parent | 0e152daec325eff736853fbbc0d1cab0822df2e3 (diff) | |
am cc5494c9: Out Of Band API for Secure Simple Pairing.
Merge commit 'cc5494c9996f809e36539b24e8b6b67683383d29' into gingerbread-plus-aosp
* commit 'cc5494c9996f809e36539b24e8b6b67683383d29':
Out Of Band API for Secure Simple Pairing.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions