am da7591e7: Merge "Add missing finish() calls to multithread and multi context tests...
authorMika Isojärvi <misojarvi@google.com>
Mon, 11 Jan 2016 19:34:48 +0000 (19:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Jan 2016 19:34:48 +0000 (19:34 +0000)
am: e5d84c3861

* commit 'e5d84c38611625dac7398d5e141ce3f74cfd2c0b':


Trivial merge