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

* commit '798375afa0742f3b89d18b75ca0580f30410ba7d':


Trivial merge