tree ca4f4b5ed08e7308e905fe35cd0ce352f7df3e55
parent 7a12bb2179bb2cf0b838b7f1f791630abac4344d
parent c3a46cd1b01e532abd0963faca419f5ea84656ba
author Lucas Dupin <dupin@google.com> 1592273549 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1592273549 +0000

Merge "Hook up media player resumption to UI" into rvc-dev am: df9b697804 am: c3a46cd1b0

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

Change-Id: I29097d0bacc2eb70e16931a6dd9f30f3c014ea4c