summaryrefslogtreecommitdiff
path: root/opengl/tests/gl_basic/gl_basic.cpp
diff options
context:
space:
mode:
authorJean-Michel Trivi <jmtrivi@google.com>2010-04-12 12:11:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-04-12 12:11:54 -0700
commitc8cd1dc882f984ecd14907298623b4b4fbe64df0 (patch)
treec4333b1d19b4dea3beb4fd5c98a3afcd88572544 /opengl/tests/gl_basic/gl_basic.cpp
parent714004ede7610fab835b43f827414d8188a4c375 (diff)
parent82c11703ddeb732ab2e23187909d7b1c6c66cd51 (diff)
am 54419a4f: am 12221b6f: Merge "Fix monkey bug 2586534 java.util.ConcurrentModificationException Unlike the other audio focus and media button stack handling methods, abandonAudioFocus() and unregisterAudioFocusClient() were not synchronized around their focus stack.
Merge commit '54419a4fc908eab8408f39f3eae97c4315135d84' into kraken * commit '54419a4fc908eab8408f39f3eae97c4315135d84': Fix monkey bug 2586534 java.util.ConcurrentModificationException
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions