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

* commit '6a4edf34e3a65c02b50d99393092bf5f2cd5b4f7':


Trivial merge