| commit | d322411cd8563f5331f79093f1462d6febcc8d5c | [log] [tgz] |
|---|---|---|
| author | Jakub Pawlowski <jpawlowski@google.com> | Mon Jul 26 16:00:31 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jul 26 16:00:31 2021 +0000 |
| tree | b3436ab0d69cf3fa2e8e322ed3fd0feb47700c62 | |
| parent | f3af3dfdac66040002379fdc9b31adc3841f7838 [diff] | |
| parent | 75700c9ee5cedffcdc426502bad5ae25bbf51db8 [diff] |
[automerger skipped] Merge changes I7b0f41cb,I1980f890 am: c30aabdc1f am: 75700c9ee5 -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: Ie9f260168e08f3ced27ccf61508d1beff03f616c