commit | bf4bfb188d7045fa60f4f802cb6b90377c4774ad | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 26 02:11:31 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 26 02:11:31 2020 +0000 |
tree | 3360232b0ee1e866f0317d64ba878f1c5519278b | |
parent | 3390336393da860e2fbdcddaf9af1724c6877ec9 [diff] | |
parent | de1759dd87db4f0966a93ec96d1be6d6476dcacd [diff] |
[automerger skipped] Merge "Merge stage branch to development trunk." am: 512ee5976e -s ours am: a6d107c011 -s ours am: de1759dd87 -s ours am skip reason: Change-Id I869b8567bbccfef1ccad01f47cdf5138935b6996 with SHA-1 ba8fee2a1d is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1409196 Change-Id: I4d3625c6cc5332b74eca2e62acef3f0e632c5275