tree 7ac7ca3050f993c15f62ac2fd63d9b2de4f55189
parent 980d88d9a70451c8caec882e4488e38c90427c1f
parent db7d85c8e7c81dce58c5e7ace3f0bf208a3d39b6
author Adrian Roos <roosa@google.com> 1502996110 +0000
committer android-build-merger <android-build-merger@google.com> 1502996110 +0000

Merge "AOD: Delay removing AOD scrim after pulse" into oc-mr1-dev am: 36d3f3fd02
am: db7d85c8e7

Change-Id: Id48c8b64601fa20a2076230c24af68e4b27446ec