am 47b824e1: am 536b7d72: am 613ce462: (-s ours) am 15f67207: Use RGBA8888 base confi...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 21:00:20 +0000 (21:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 21:00:20 +0000 (21:00 +0000)
* commit '47b824e1f4ff2af900c6b585b46f35a5d314c38f':


Trivial merge