diff options
| author | Dianne Hackborn <hackbod@google.com> | 2011-12-05 19:18:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-05 19:18:34 -0800 |
| commit | 4e6a13e794a01e0511011da266bd5f528baeef2e (patch) | |
| tree | 0784d17d80f88a0c09f9a2c4f6ecc4047af63cef /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | 6d28bf7b303402e72c01ed634692026c7ab148b2 (diff) | |
| parent | de63dc278aafcd6cddd77ca0769fe07c135d8fba (diff) | |
am 0c0120ef: Merge "Fix issue #5714517: App shortcuts can result in bad task intents" into ics-mr1
* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
Fix issue #5714517: App shortcuts can result in bad task intents
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions