summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJerry J. Wang <jerryw@google.com>2011-06-23 14:29:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-23 14:29:55 -0700
commit996bdbaaf0b532c77c10a1efea3b17eb50f416db (patch)
treea908b03c6d3216f127d973d5e82f26a34d2acbe8 /tools
parent16d1f17675c02282226936e11f4a9cb646eeeaa1 (diff)
parent4333de2a8e878b319c0e779942b87c042804d352 (diff)
downloadframeworks_base-996bdbaaf0b532c77c10a1efea3b17eb50f416db.zip
frameworks_base-996bdbaaf0b532c77c10a1efea3b17eb50f416db.tar.gz
frameworks_base-996bdbaaf0b532c77c10a1efea3b17eb50f416db.tar.bz2
am 4333de2a: (-s ours) am a5342f1a: am 850aaaef: Merge "Don\'t throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)" into honeycomb-mr2
* commit '4333de2a8e878b319c0e779942b87c042804d352': Don't throw exception for EGL_BAD_CURRENT_SURFACE (DO NOT MERGE)
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions