diff options
| author | Dave Santoro <dsantoro@google.com> | 2011-11-17 15:12:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 15:12:52 -0800 |
| commit | c5b057f42372e7a3b0560afe88a243378255c2e2 (patch) | |
| tree | bb19a88f3e5037d8774f06cbf23d3de75f584f5f /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 778f146cf422edabf140a18afa8746e542a49ebd (diff) | |
| parent | 60e345a9a95a0f24804f729eeb5216012d1bcbac (diff) | |
am 60e345a9: am 9be49620: Merge "Unhide social stream permissions." into ics-mr1
* commit '60e345a9a95a0f24804f729eeb5216012d1bcbac':
Unhide social stream permissions.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions