| commit | e1844f90ef8c6c1a8f643ed48bd005fdecf4583d | [log] [tgz] |
|---|---|---|
| author | Ian Baker <ibaker@google.com> | Fri Oct 20 00:59:34 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Oct 20 00:59:34 2023 +0000 |
| tree | aa518d82577ceaefaf1a588a2a468770d1de179e | |
| parent | affeaf7227a02253e577889b915c4af5a95331f7 [diff] | |
| parent | 52656cba59058131134c4f4d7750e43e0f18b591 [diff] |
[automerger skipped] Merge "Cherry-pick MediaFrameworkTest dep changes from internal main" into main am: 6a63d356f5 -s ours am: c71cfb9429 -s ours am: 52656cba59 -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: I388ea53b17fd2df5a4e209303229410cc7885a22 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>