tree 9acaf8139ec9ca2d4626257485d2886b6d8a08f8
parent f6f77de370701684ae897904f3cb716ec0b33d16
parent ce9ea9f440bddeb14b8ec0a5647fede3999e3fdd
author Lucas Dupin <dupin@google.com> 1595959861 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595959861 +0000

Merge "Add new touch effect to player" into rvc-dev am: 12ea0fe96b am: ce9ea9f440

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11377343

Change-Id: I509752627166011529a3a817deb50b8a53afce14