| commit | 588276b999f932a72c438cce1f954bde5927960d | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Jun 15 01:23:41 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jun 15 01:23:41 2022 +0000 |
| tree | 5eb622f997a5d45618bd31c6fff5cb19e2845e5c | |
| parent | a220396617238915dac50952b05b87b9e6250417 [diff] | |
| parent | bb96e70d48d3ad674f4c778dbd9d57602dbf74c3 [diff] |
[automerger skipped] Merge changes from topics "cherrypicker-L37600000955090666:N36200001273131748", "cherrypicker-L79000000955070414:N24400001272804687" into tm-dev am: f51f239bde am: c4b0ed31ef -s ours am: 33575451e5 -s ours am: bb96e70d48 -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: Ib04b903f9f9748b065a5185fb739d55250c9aa28 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>