| commit | 33575451e58004c3a43462153716072d456d2e14 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Tue Jun 14 23:00:04 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 14 23:00:04 2022 +0000 |
| tree | 22d9e8e71f2e79335c27e6e7bd9c9f1662248143 | |
| parent | 2b1b93ef4a491a4015ae129213b3d9ff9c2e4dfb [diff] | |
| parent | c4b0ed31ef958bb878552ae4ffcf91c9a54012a8 [diff] |
[automerger skipped] Merge changes from topics "cherrypicker-L37600000955090666:N36200001273131748", "cherrypicker-L79000000955070414:N24400001272804687" into tm-dev am: f51f239bde am: c4b0ed31ef -s ours am skip reason: Merged-In Idb83c6e6e416665405fbe498dce8d56a3cdf857c with SHA-1 d9f9844aeb is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/18870819 Change-Id: I0ebb951c0b80111d474128b6a5ba86def44264de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>