summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorChristopher Tate <ctate@android.com>2009-10-29 13:41:28 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 13:41:28 -0700
commit72c0d293793bfacb0ad9ebcefec305cca7e5dd2e (patch)
tree283bd5b8f247c87d13879940eafcc400bafadb71 /opengl
parente7672d0041f7d4093cac6db1233cd22b5cc45a01 (diff)
parent763ccae7d734cc7e55772936dc3f101a2bf453d4 (diff)
downloadframeworks_base-72c0d293793bfacb0ad9ebcefec305cca7e5dd2e.zip
frameworks_base-72c0d293793bfacb0ad9ebcefec305cca7e5dd2e.tar.gz
frameworks_base-72c0d293793bfacb0ad9ebcefec305cca7e5dd2e.tar.bz2
am 763ccae7: (-s ours) Merge change I8e7f5f07 into eclair
Merge commit '763ccae7d734cc7e55772936dc3f101a2bf453d4' into eclair-mr2 * commit '763ccae7d734cc7e55772936dc3f101a2bf453d4': DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions