am 12b225fb: Merge "Remove EGL random multithreaded resource sharing tests." into...
authorKalle Raita <kraita@google.com>
Mon, 11 Jan 2016 19:48:01 +0000 (19:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:48:01 +0000 (19:48 +0000)
am: 593b46dc7f

* commit '593b46dc7fc0b7488e2963586c6465299bcd43a1':


Trivial merge