diff options
| author | Chung-yih Wang <cywang@google.com> | 2010-10-10 14:21:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-10 14:21:18 -0700 |
| commit | f700eb2cfaa2f7ff2d667a0622ca0092d4d620b5 (patch) | |
| tree | dea944ef79b5fba8dac214b522bd2f9a5623b054 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 63a611986ce1605b8dd613b23a807d6e0f1a2c65 (diff) | |
| parent | 1f821cd3adb14930f96a6b54431a9006c2d25d7e (diff) | |
am 77880ae4: am 44b7ef54: Merge "SipService: add permission check for using API" into gingerbread
Merge commit '77880ae4187d92506848249585687fc9d0c0dd25'
* commit '77880ae4187d92506848249585687fc9d0c0dd25':
SipService: add permission check for using API
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions