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

* commit '0b23df38baab0e4cc0a41eb6e5ce702ba7cedbd3':


Trivial merge