| commit | de1759dd87db4f0966a93ec96d1be6d6476dcacd | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Aug 26 00:34:34 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 26 00:34:34 2020 +0000 |
| tree | 1a3e1d74817e4b695927fa4b1a7e021aa4d75e73 | |
| parent | 50af31ba90045e7a1d97c2a3abfe8affd856e095 [diff] | |
| parent | a6d107c011ede2daacca0a5170a14958a9376d2d [diff] |
[automerger skipped] Merge "Merge stage branch to development trunk." am: 512ee5976e -s ours am: a6d107c011 -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: Id067e173a5c82298b8764c426c7f72054fa79da5