summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2011-04-27 13:54:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-04-27 13:54:08 -0700
commitb4a56f10d875dc62a9c73008f98596c7e32fc249 (patch)
tree5258eff2bba73aad718a47790270671e511f5f44 /core/java/android
parent36f873c765fee84ec26b0e21021ef4c6edc78123 (diff)
parentba5aebd106c61567ad6be905efd18902025735aa (diff)
downloadframeworks_base-b4a56f10d875dc62a9c73008f98596c7e32fc249.zip
frameworks_base-b4a56f10d875dc62a9c73008f98596c7e32fc249.tar.gz
frameworks_base-b4a56f10d875dc62a9c73008f98596c7e32fc249.tar.bz2
am ba5aebd1: am ac505b86: am f0556bb9: am 86d1d747: Merge "Add lock before calling initEglImage"
* commit 'ba5aebd106c61567ad6be905efd18902025735aa': Add lock before calling initEglImage
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions