Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 63d29afa authored by Xin Li's avatar Xin Li Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am:... 

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 9ad4faab -s ours am: adc09114 -s ours

am skip reason: Change-Id I5fe0f4309a3d7bf81b29cafa90b38a74203146ff with SHA-1 c5970fd0 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1521222

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I803a31945a4f70a3010e1c6cd718d96c9be9beab
parents deddbbc1 adc09114
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment