commit | ba604618fd83df535007ef9f351286cd215d12a0 | [log] [tgz] |
---|---|---|
author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 26 02:33:09 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 26 02:33:09 2020 +0000 |
tree | a83cde48426283e10c84e3945337b9a541600c2f | |
parent | a754acd517eb111921c136f3c920366b9215857f [diff] | |
parent | bf4bfb188d7045fa60f4f802cb6b90377c4774ad [diff] |
[automerger skipped] Merge "Merge stage branch to development trunk." am: 512ee5976e -s ours am: a6d107c011 -s ours am: de1759dd87 -s ours am: bf4bfb188d -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: Icefaa091a875fc34f8d0fbbcb1ecf5cfaaaa3b0d