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

* commit '536b7d72a1503f9f4932d7ca9a0d78963c27f491':


Trivial merge