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

* commit '8cd7ecee8c98e8f24023c92c065f8fd2d3eeb81e':


Trivial merge