am 536b7d72: am 613ce462: (-s ours) am 15f67207: Use RGBA8888 base config for EGL...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 14:47:08 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:08 +0000 (14:47 +0000)
* commit '536b7d72a1503f9f4932d7ca9a0d78963c27f491':


Trivial merge