tree 11844622c3343d58f7d0c77e0683fd4828a2fe2b
parent d62bb69a41f5c4182889c53510fc889b2cd7d4f2
parent aac5431f6bc11e02d893199c40abb640110705ad
author Adrian Roos <roosa@google.com> 1502190197 +0000
committer android-build-merger <android-build-merger@google.com> 1502190197 +0000

Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am: 6e4de6ccdf
am: aac5431f6b

Change-Id: I810bf53ff9c6b222fc01886b042c4d0f1661011b