| commit | daab4738a310885e505f1243d3bee369838d41a7 | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Mon Jul 26 16:28:44 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 26 16:28:44 2021 +0000 |
| tree | 7a45c658507c0ba8d14691c89d5c1c2fb73c78d7 | |
| parent | 4c0940649d6038bfc0d1412b95275c34b381d3c7 [diff] | |
| parent | 8108d7961c5f0bbffa608e6419a6eb05dba11c5d [diff] |
[automerger skipped] Merge changes I7b0f41cb,I1980f890 am: c30aabdc1f am: 75700c9ee5 -s ours am: d322411cd8 -s ours am: 8108d7961c -s ours am skip reason: Merged-In I7b0f41cb3f90096d9e19337ed1e3952a3dcdff3f with SHA-1 2e4e3e6ff4 is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1772636 Change-Id: I710adb3031b07803a9ffef76e12f2c4f2258fd47