commit | da3bf3bb26c27e6bba7b8125a93ddb452d0f60f4 | [log] [tgz] |
---|---|---|
author | Adrian Roos <roosa@google.com> | Tue Aug 08 11:08:50 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Aug 08 11:08:50 2017 +0000 |
tree | b8aea3b9ed517084dbc25eb8f018a361c0a70b7c | |
parent | 5f65a480046bc39eb15e10f1d0182b52de8895b8 [diff] | |
parent | 5149fa458cddfeb555346b8226a0e8888ad60dc6 [diff] |
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am: 6e4de6ccdf am: 3d8fd6e4b9 am: 5149fa458c Change-Id: I60419fa88eaf52cb3ce30775881b5fa62c446ada