OSDN Git Service

Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1...
authorAdrian Roos <roosa@google.com>
Tue, 8 Aug 2017 11:03:14 +0000 (11:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 8 Aug 2017 11:03:14 +0000 (11:03 +0000)
am: 3d8fd6e4b9

Change-Id: Idea0d06f3b548f99c6504044a193db42368381c8


Trivial merge