| commit | bf912b235ad8e40ee1702e94502167052d3462af | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Tue Aug 08 11:10:34 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 08 11:10:34 2017 +0000 |
| tree | b8aea3b9ed517084dbc25eb8f018a361c0a70b7c | |
| parent | da3bf3bb26c27e6bba7b8125a93ddb452d0f60f4 [diff] | |
| parent | 37e6b3e2f4145810733483ed9391ef09d0b13089 [diff] |
Merge "Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am: 6e4de6ccdf am: aac5431f6b" into oc-mr1-dev-plus-aosp am: 37e6b3e2f4 Change-Id: I7234aef6d91bdfd778f667a2ec44cc5eec6e4422