aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2021-10-08 01:39:47 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-10-08 01:39:47 +0000
commit2de22834e13d87dbfaab617badf54489510c90dc (patch)
treed849791180a7c14f53a5946412e6122e22634147
parentbc53962c3215d9be9f8e0776b35d115232b1869f (diff)
parent1383f9a18f4ad70e9313f31e27fc04daefc30727 (diff)
downloadlibavc-2de22834e13d87dbfaab617badf54489510c90dc.tar.gz
[automerger skipped] Merge Android 12 am: 12e23d0f91 -s ours am: 1383f9a18f -s ours
am skip reason: Merged-In I5e6d1f815848beed302adcb643ca9cd9bae5a31e with SHA-1 d378c44714 is already in history Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/1847357 Change-Id: I6fbc37f88dea1fe79eb5fca2fdd690b0e65b6e9e
0 files changed, 0 insertions, 0 deletions