| commit | 20d43f3219191d2a17dd2fb62c1e6619ed96492c | [log] [tgz] |
|---|---|---|
| author | Adrian Roos <roosa@google.com> | Fri Aug 25 22:23:13 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Aug 25 22:23:13 2017 +0000 |
| tree | 562146d671252b51a4c696a5db1b23e5e1af0207 | |
| parent | 4581a6247c44e710838b813921f9e0b40effc364 [diff] | |
| parent | 9a224d4aba0f02c8aab7f6d773599b3d85dd96e5 [diff] |
Merge "Merge "AOD: Only play wakeup animation when actually waking up" into oc-dr1-dev am: feb69bf5a7 am: 3825027579" into oc-mr1-dev-plus-aosp am: 9a224d4aba Change-Id: Ie9d8c5a90e9763a7d45f50a88284d8029ca18525