tree 366d6f69e914393a51a775c78aa937f84402898b
parent e2e4001cb22b4988ba862340573f15f51ce7a3ca
parent 7d52d0c0446757fa3389eb2256e56323afa1ce1b
author Android Merger <android-build-merger@google.com> 1490238667 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1490238668 +0000

Merge "Merge "Fix turning off duing parallel testing and multiple ITS activities" into nougat-cts-dev am: 8618bdab0e" into nougat-mr1-cts-dev