tree 91a1a64219c64d6737a296471c4a407b1cbf62ab
parent fc002cd65d07e7f5ba874fd01e801c9e2fa14f14
parent 8dd0c91126f8bf2afced36914040bcaa87dc1e49
author riddle_hsu <riddle_hsu@htc.com> 1492008635 +0000
committer android-build-merger <android-build-merger@google.com> 1492008635 +0000

Merge "Merge "DO NOT MERGE: Skip multi-window test if not supported" into nougat-cts-dev am: 9878d0cb32  -s ours am: 2929171d92 am: 3c51bc8deb" into nyc-mr1-dev am: 3ce07e787b
am: 8dd0c91126

Change-Id: I3738075e7655211e747114df4295231fea33a6bc