diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-04-13 15:29:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-13 15:29:19 -0700 |
| commit | 8eb30530e96cd71df45cabd9702c038bb77437db (patch) | |
| tree | 744fcc6bd303f071d2ff642be0cefb7e8d8247b6 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | bf82379ecd430fe8afd3eb5e7e121977bf469942 (diff) | |
| parent | 72397544b4a9f57d2746a5bfb7ac9dfce1527a95 (diff) | |
am 7125a0dc: am 42843c3c: Merge "Fix Throttle Notification intents" into froyo
Merge commit '7125a0dca844b066a3f6ebdacaea4ade9e651c8d' into kraken
* commit '7125a0dca844b066a3f6ebdacaea4ade9e651c8d':
Fix Throttle Notification intents
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions