commit | 3d8fd6e4b9b3210b3c93a6a8b1c4071ba35a1f31 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Tue Aug 08 10:57:18 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 08 10:57:18 2017 +0000 |
tree | 2ce29998054fb33ecd44ead9f56f1e3672772cc1 | |
parent | aa73a69d3ad366482e811502832171241375b698 [diff] | |
parent | 6e4de6ccdf0c0fffa191acf05775d6f87c889d51 [diff] |
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am: 6e4de6ccdf Change-Id: I1eb1c997c551461ff09efd1f3ea35276cbb4d43d