am 6a4edf34: am ae8d7d8e: (-s ours) am 12b225fb: Merge "Remove EGL random multithread...
authorKalle Raita <kraita@google.com>
Thu, 27 Aug 2015 14:47:02 +0000 (14:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 14:47:02 +0000 (14:47 +0000)
* commit '6a4edf34e3a65c02b50d99393092bf5f2cd5b4f7':


Trivial merge