tree 01ad8810ef13fec9666856bad4378253f77dea3b
parent 6d617dfc24dc88d123d38bba5fb03d3bff67302d
parent f98d1516bc5d5a1679b57f50065c9b42d964fefa
author Andrii Kulian <akulian@google.com> 1502520380 +0000
committer android-build-merger <android-build-merger@google.com> 1502520380 +0000

Merge "Merge "Update background crop animation threshold" into oc-dr1-dev am: 79e11e4429 am: e76fc100e4" into oc-mr1-dev-plus-aosp
am: f98d1516bc

Change-Id: Ia624190cdf662284e5f09b8e71dc321546ab7474