summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorChristopher Tate <ctate@android.com>2009-10-29 14:01:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-10-29 14:01:19 -0700
commitcda27c790adc37804ba1940c027621ab232de1b3 (patch)
tree1e5d0ecbf3203251ec7804e6dc859b8e1991fd8e /opengl
parent0ae9e101a6cdf4e31cb130fd120fd5a05847e2d3 (diff)
parent72c0d293793bfacb0ad9ebcefec305cca7e5dd2e (diff)
downloadframeworks_base-cda27c790adc37804ba1940c027621ab232de1b3.zip
frameworks_base-cda27c790adc37804ba1940c027621ab232de1b3.tar.gz
frameworks_base-cda27c790adc37804ba1940c027621ab232de1b3.tar.bz2
am 72c0d293: am 763ccae7: (-s ours) Merge change I8e7f5f07 into eclair
Merge commit '72c0d293793bfacb0ad9ebcefec305cca7e5dd2e' into eclair-mr2-plus-aosp * commit '72c0d293793bfacb0ad9ebcefec305cca7e5dd2e': DO NOT MERGE: Fix loss of focus after wakeup into incall screen
Diffstat (limited to 'opengl')
0 files changed, 0 insertions, 0 deletions