| commit | 52656cba59058131134c4f4d7750e43e0f18b591 | [log] [tgz] |
|---|---|---|
| author | Ian Baker <ibaker@google.com> | Thu Oct 19 20:13:55 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Oct 19 20:13:55 2023 +0000 |
| tree | 0d5a93ab996f0402d799b2d68bca77aedf32313f | |
| parent | 6eae57d99054940ef0dcd873cf3513c8b990507f [diff] | |
| parent | c71cfb9429ef2a5ceb3cdddb5759c50910680a1d [diff] |
[automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into main am: 6a63d356f5 -s ours am: c71cfb9429 -s ours am skip reason: Merged-In I7e29732e1e77e37cfb491521d14d2f3eb07deb36 with SHA-1 bbe98fe36b is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2796172 Change-Id: I5894b989e1ac3f17bad91ba0f927b8694783cef9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>