commit | 8637fb888a38fe87e8f387fe7fd6f6c0367c3707 | [log] [tgz] |
---|---|---|
author | Ian Baker <ibaker@google.com> | Tue Oct 31 14:15:53 2023 +0000 |
committer | Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Wed Nov 01 14:04:54 2023 +0000 |
tree | 2c64278c722867f2c098d4e0759ba6fabe51b0b2 | |
parent | 0792d99bfb65ac97d361ca7e467d70d4185c08f0 [diff] |
Cherry-pick MediaFrameworkTest dep changes from internal main This resolves automerge conflicts in aosp/2745223 This is a manual cherry-pick of aosp/2796172 with different automerger tags (see comment: https://android-review.git.corp.google.com/c/platform/frameworks/base/+/2796172/comments/f84931d5_488e9082). Test: atest com.android.mediaframeworktest.unit.MediaMetadataRetrieverTest Bug: 298965955 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:54342761f0739a209d46938a0e956ab71c15d980) Merged-In: I8cb92fd35b3633cf458f8692173124fd1666d6b5 Change-Id: I8cb92fd35b3633cf458f8692173124fd1666d6b5