tree 6e1a24899daf83c8487d98956ec521aefa799834
parent d83faa529c9e9e0d1cc946548595cb3162be0f99
parent 5278c1e1c86cb93c94b16ebd303cb0c71a9ad942
author Christian Poetzsch <christian.potzsch@imgtec.com> 1481645895 +0000
committer android-build-merger <android-build-merger@google.com> 1481645895 +0000

Merge "egl: add EGL_IMG_context_priority to the whitelist" am: d94925cf3c am: 666bbed016 am: 75ee34f22d
am: 5278c1e1c8

Change-Id: Iac9db2a22155629f7431518f1331b6cc7864f0ae