summaryrefslogtreecommitdiff
path: root/opengl/java
diff options
context:
space:
mode:
author Swarna Kumar <skumar@google.com> 2009-11-24 13:33:13 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2009-11-24 13:33:13 -0800
commit20342ca83012b442913b409a9218635de9bd6aa6 (patch)
treec8b068513764846f6e5d96746cbe63f03e90e637 /opengl/java
parent66358e24a6bbc2017c2edd921a64e616b4c9cac4 (diff)
parent7f8e34091efdee1a383280b08585f8254472c1fd (diff)
am 7f8e3409: Merge change I816428ae into eclair
Merge commit '7f8e34091efdee1a383280b08585f8254472c1fd' into eclair-mr2 * commit '7f8e34091efdee1a383280b08585f8254472c1fd': Temporarily add explicit step to disable keyguard to imf tests to attempt solve test flakiness.
Diffstat (limited to 'opengl/java')
0 files changed, 0 insertions, 0 deletions