tree 7b396cc1a142a4ccb5be7da5c8a5902b5ee91c7b
parent 66f0fc4dba505a6f91a707ac4a441f4345229c97
parent 73aa04b4639688674712d18b65b3121a7f49e20a
author Sunny Goyal <sunnygoyal@google.com> 1574187724 -0800
committer android-build-merger <android-build-merger@google.com> 1574187724 -0800

[automerger skipped] Updating VideoPlayer as per androidx.media library changes am: 08320e11d6 am: 287097108b
am: 73aa04b463 -s ours
am skip reason: change_id I814a25181c27bab73c146d5eb117d56f3264452c with SHA1 197cc87be8 is in history

Change-Id: I7b1c7b957daadf76cd60aba824d419ef587597a6