| commit | aac5431f6bc11e02d893199c40abb640110705ad | [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 | cf56fbb90be916dcec27bfa7a93825c35f096d17 | |
| parent | 249acda3b6b7d8953184f38a7ec1b5b77aa99f0f [diff] | |
| parent | 6e4de6ccdf0c0fffa191acf05775d6f87c889d51 [diff] |
Merge "ScrimController: Wait with clearing wakup animation until done" into oc-dr1-dev am: 6e4de6ccdf Change-Id: I55938f50f29289e1dcc51be18561d0819caa2b9b