tree 688fb41cbcc5fa8d4a5737cf616ab0ed2c10d119
parent 7b387196a21aa1df18fa1b1c3007a8c009453e5e
parent b499bd85fa5655bbfd7eefbe5313826e3ae8a495
author Aurimas Liutikas <aurimas@google.com> 1487276586 +0000
committer android-build-merger <android-build-merger@google.com> 1487276586 +0000

Merge "Workaround a bug in tradefed runner not supporting assumeTrue()" into nyc-support-25.2-dev am: 6e62618d9d
am: b499bd85fa

Change-Id: If0c75e74b1c67d9f286235dbfcd01a7362dcb71f