diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-05-16 11:06:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-16 11:06:28 -0700 |
| commit | 77c7b95e11bfdffb4f80f9b373a3d22edfe358ba (patch) | |
| tree | 1f465c937ea4ed997c1a9048c3d9c9fe3bf79276 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 20530813e6b82acd6b3b66017a6508c37a3585cb (diff) | |
| parent | 658d84fad7ab75a2c19b64cb4c40474bd65fb156 (diff) | |
am 700ab1c7: Merge "DO NOT MERGE. Integrate from master: Improve activity manager debug dumps." into honeycomb-mr2
* commit '700ab1c75862babba90f54e02bdc877becd4f4fc':
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