| commit | 37e6b3e2f4145810733483ed9391ef09d0b13089 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Aug 08 11:05:15 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Aug 08 11:05:15 2017 +0000 |
| tree | 11844622c3343d58f7d0c77e0683fd4828a2fe2b | |
| parent | 5149fa458cddfeb555346b8226a0e8888ad60dc6 [diff] | |
| parent | 09b13a010f60bc0d6728e96e397e7e09bf5649b6 [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