am 613ce462: (-s ours) am 15f67207: Use RGBA8888 base config for EGL image functional...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:51:27 +0000 (19:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:51:27 +0000 (19:51 +0000)
am: 7f975eca92

* commit '7f975eca9278637f2edd8e263e8365379f6600f3':


Trivial merge