diff options
author | Dave Santoro <dsantoro@google.com> | 2011-11-17 12:27:44 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 12:27:44 -0800 |
commit | e16f48b12632b4fdc62e501167a5b228307bff7e (patch) | |
tree | 6612a4783a0af5dacf89a520c8ea80420dc0103b /opengl/tests/gl_basic/gl_basic.cpp | |
parent | 0b596f3383cc9777995451baf8a3f9713fa1be63 (diff) | |
parent | 52afa59ed051b763151f22de150de6cd1ad968aa (diff) |
am 9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '9be4962060ca67c4fe9bfc391043f6d2829cf720':
Unhide social stream permissions.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions