diff options
| author | Peter Ng <petergng@google.com> | 2011-10-21 16:45:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-21 16:45:23 -0700 |
| commit | f1b1ee1eb28576a7a71ca62817ed0ac8fdce7ee9 (patch) | |
| tree | 28eee3f42811afd37db117e8ea5ec72270f61958 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 231c43a7b279c0fd47e188f1deb5ed96b39b524c (diff) | |
| parent | 724e6d05ebce56a2190c1f3a81a3f527fad5384a (diff) | |
am be25d5b0: (-s ours) Merge "Do not merge - Recents background protection increased" into ics-mr0
* commit 'be25d5b05639c8475b7faf312959923db86efa5d':
Do not merge - Recents background protection increased
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions