am ae8d7d8e: (-s ours) am 12b225fb: Merge "Remove EGL random multithreaded resource...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:50:26 +0000 (19:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:50:26 +0000 (19:50 +0000)
am: 919646579b

* commit '919646579b3d621f8c76f68a4ef0af7fa751159f':


Trivial merge