diff options
| author | Xavier Ducrohet <xav@google.com> | 2010-02-12 17:55:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-02-12 17:55:17 -0800 |
| commit | 8baa5d14434367e9e6cc9fe897409b4aef15e217 (patch) | |
| tree | 6c0dfff1a042bfd8cab8e6fcfed2de68ab2af55a /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 8f281cc4bc607a7784c109d6afc2a70c268ab165 (diff) | |
| parent | 0256b03e6e7d23bcee8ebd84892ee02d05e886a1 (diff) | |
am ddcf25ea: (-s ours) am 2be56ccb: Merge "Add --auto-add-overlay option to aapt. DO NOT MERGE" into eclair
Merge commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4'
* commit 'ddcf25ea7e1b21b908da73000630c72d6fa146b4':
Add --auto-add-overlay option to aapt. DO NOT MERGE
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions