OSDN Git Service

Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into...
authorWale Ogunwale <ogunwale@google.com>
Tue, 2 May 2017 20:29:00 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 2 May 2017 20:29:00 +0000 (20:29 +0000)
commit19ac164d1ba25751da317807a149cb46e65d827f
tree7874299938621ee3d496e4371a7a17fb3d742756
parent0ed16d0d42e974f0cd16b1b26cc7a6f4b3dc388e
parent5f0e436548ea3bd10cef480c194da7da6080ac1e
Merge "Disable flaky DisplayContentTests#testFocusedWindowMultipleDisplays" into oc-dev
am: 5f0e436548

Change-Id: Icc1d09c16abc31d15a7ea5960ab1640ae265c31c