From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Mon, 22 May 2017 22:07:11 +0000 (+0000)
Subject: Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
X-Git-Tag: android-x86-9.0-r1~1044^2~593
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=78af0424fe;p=android-x86%2Fframeworks-base.git

Merge "Attempt to fix broken/flaky FadeTransitionTest" into oc-dev
---

78af0424fe0c51665dd081fdc7bde6603d9045bf