commit | 6dbe7f533395c102a5703451eba448511f8c9df2 | [log] [tgz] |
---|---|---|
author | Mikhail Naganov <mnaganov@google.com> | Mon Feb 14 18:34:00 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 14 18:34:00 2022 +0000 |
tree | e126d8813779d85cfd66c45f95c6efe80453dccf | |
parent | 95eb8c3b7669ea1a595c1a535890fd8e31482d5e [diff] | |
parent | 16a3f820fb3a07555ba4c828e00919e0e4d226c9 [diff] |
[automerger skipped] Merge changes from topic "upstream-hal-v7_1-p4" am: faab202a2d am: 4dd84e0f6f am: 16a3f820fb -s ours am skip reason: Merged-In I95bafe631059ebd4183722e676d26fb271f5a0b5 with SHA-1 e08673de60 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1983806 Change-Id: I7c6434b49a4d631071c5c128735a9a9088d6f112