| commit | d9f19a87cfcd22956d62cc379338320bb23c0aaf | [log] [tgz] |
|---|---|---|
| author | Lucas Dupin <dupin@google.com> | Wed Oct 11 03:12:46 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Oct 11 03:12:46 2017 +0000 |
| tree | 186099d0734717a9d0f3ca4f1b245a9b5551c5ce | |
| parent | 2d729d55aaeb8658dc79ca48ba5a77723510ebb1 [diff] | |
| parent | 5493abd69225a4a112aa04ddda63876120d19300 [diff] |
Merge "Fixed problem where scrim transition would be cancelled" into oc-mr1-dev am: 43aca9cdc8 am: 5493abd692 Change-Id: I2f3c3a46a30eeb2287d276ca68a53d555a4f2669