| commit | 9dade0ac5087d50faf6f7721608388d1fdd023a4 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 21:20:30 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 21:20:30 2021 +0000 |
| tree | ba514307411fb647fadf1548b672230a623ce20c | |
| parent | bfa2e553d12c5779855db1f720998fa0df5d6f85 [diff] | |
| parent | f72b417eb9ef47bbe80af2b3b492cdafa95214cd [diff] |
[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 6dd2ccb095 -s ours am: f72b417eb9 -s ours am skip reason: Merged-In If0165fe89ba69659d9e451c0cf0cc28ca2c70616 with SHA-1 5450ceb552 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15546345 Change-Id: I61ef5e6536a3ecd1659f4663b912b1634080ab42