Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from
authorXin Li <delphij@google.com>
Thu, 12 Jan 2017 23:09:38 +0000 (15:09 -0800)
committerXin Li <delphij@google.com>
Thu, 12 Jan 2017 23:10:20 +0000 (15:10 -0800)
commit2a9d42a651ef444f32f0a6e60711bb2c371d3fce
treef938d7d2ce60f860235e107cb31a870dda4940e4
parent4b09d218b75fd1bdbc51d3cd70be9034cd1bfcbb
parent09e8b66d03077e9a9b310145112cfd0e747e06f3
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from
nougat-cts-dev to nougat-cts-mr1-dev.

BUG: 33090058
Change-Id: I7a8bacd16b5d98255987c5632e73dd823d8643be
android/cts/runner/src/com/drawelements/deqp/runner/DeqpTestRunner.java