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)
am: 5f0e436548

Change-Id: Icc1d09c16abc31d15a7ea5960ab1640ae265c31c


Trivial merge