tree abc1aaea929da0eb0613929a31b10b25de7f89eb
parent 1501d54d63c55dc4e8f4c6eeaeac35aca6660ffc
parent a1d49ce1f11d18f0e1592c9567e911e1728fc4a4
author Jamie Gennis <jgennis@google.com> 1346878130 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1346878131 -0700

Merge "EGL_ANDROID_fence_sync: make it more generic" into jb-mr1-dev