diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-04-13 15:25:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 15:25:05 -0700 |
| commit | 72397544b4a9f57d2746a5bfb7ac9dfce1527a95 (patch) | |
| tree | 3e5f86120f1ff365c1753580da989ae35d07c503 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | c33ba4f4e836fff49cc22996b71df712bb261195 (diff) | |
| parent | 2a75ab0da521b5536dd60dc15f6b1dea259303a4 (diff) | |
am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '42843c3ceb8b17e860112f8f2718cda40de15839' into froyo-plus-aosp
* commit '42843c3ceb8b17e860112f8f2718cda40de15839':
Fix Throttle Notification intents
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions