diff options
| author | Nick Pelly <npelly@google.com> | 2011-11-11 13:59:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-11 13:59:09 -0800 |
| commit | 34059a912520e6c145f18373c4300e4a567da89d (patch) | |
| tree | 1b0de8a196b2bd799ccf3daa9c9b391a6a3f161f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 44ada1845d721500e4bbddabfd70c8188cf80dbf (diff) | |
| parent | 4780228fb2476304e29ddf9a118c460ac4eb96ee (diff) | |
am 4780228f: am 48b651cb: Merge "Changes for access control." into ics-mr1
* commit '4780228fb2476304e29ddf9a118c460ac4eb96ee':
Changes for access control.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions