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

* commit '69a5fb9cf72488c85eff5451984db2859bb7dd1f':


Trivial merge