diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-10 01:59:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-10 01:59:34 +0000 |
| commit | cbc722382f6edd61d68ddf3ef29cbaa685b2b7ef (patch) | |
| tree | 93dbba2556ecf85481be7807f6db8098015a21f9 /tests/c2_e2e_test/jni/common.cpp | |
| parent | 43f7d484a1d4e533fbd096e9a128ae4f940360c3 (diff) | |
| parent | d3131fb5839301a34bf211caee5c45ea49cec26e (diff) | |
| download | v4l2_codec2-cbc722382f6edd61d68ddf3ef29cbaa685b2b7ef.tar.gz | |
Merge "[automerger skipped] Merge Android 13 QPR1 am: 1abdcba645 -s ours" into stage-aosp-master am: d3131fb583 -s oursandroid-u-beta-1-gpl
am skip reason: Merged-In Id2cc220b9122eec412823f577f07ecd82bad60fc with SHA-1 3db9508be4 is already in history
Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/2336996
Change-Id: I6d5a53cec9a1da146a9301fe8e040ae1af992157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tests/c2_e2e_test/jni/common.cpp')
0 files changed, 0 insertions, 0 deletions