summaryrefslogtreecommitdiff
path: root/libs/utils/BackupData.cpp
diff options
context:
space:
mode:
author Jerry J. Wang <jerryw@google.com> 2011-06-23 14:29:55 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2011-06-23 14:29:55 -0700
commit8dd06428c20ecc7a64367961441153c383da71c4 (patch)
tree4b7ff964b91b9326f9432e198f45ab5f6d0c4cc7 /libs/utils/BackupData.cpp
parent6e0c226e703681cd923cf242e85fb8da27b5db9d (diff)
parenta5d7648e8230eb7cb3b55c05d8e413053dd85693 (diff)
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 'libs/utils/BackupData.cpp')
0 files changed, 0 insertions, 0 deletions