diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 11:12:45 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-16 11:12:45 -0700 |
| commit | a8115aa2dd838e8ca615805ac5b3d14822f1820f (patch) | |
| tree | 5797ce3709bc320265cc9813cbf915f88d9c70d1 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 0ba35e3ffff18732ac8b5d744c12eee8438a792b (diff) | |
| parent | 30c47d2f95ff862bf065aa881c6dfd374745592a (diff) | |
am fbdf9df0: (-s ours) am 2a20583a: am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit 'fbdf9df053800afb25453630d11bd48cbc068271':
DO NOT MERGE. Integrate from master: Improve activity manager debug dumps.
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions