| commit | f72b417eb9ef47bbe80af2b3b492cdafa95214cd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Aug 13 20:53:34 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 13 20:53:34 2021 +0000 |
| tree | b26d0bf3de789b2e5387fc848b5eedb60a882e8c | |
| parent | b0b1143f76139a087542c3391e47b829d3149c61 [diff] | |
| parent | 6dd2ccb095376c54c3154f59ef61dd346c8bea91 [diff] |
[automerger skipped] Merge "Merge stage-aosp-sc-ts-dev before making it an upstream" into sc-dev am: 6dd2ccb095 -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: I5dd1f22d80977f7b7864e950b3852e50d9785f04