| commit | bd6c62b7398259a5a9803f14edfb90509dab8d23 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Wed Aug 23 18:37:37 2023 +0000 |
| committer | Sungtak Lee <taklee@google.com> | Wed Aug 23 21:37:40 2023 +0000 |
| tree | d83fb3887dc7909fed38d5fd35bd84aa09dfced1 | |
| parent | 373db9a97ba6f380a8a671463185b15e61a2b35a [diff] | |
| parent | df50b6d36f7faba14f66edd459164d83d809ec0a [diff] |
[conflict] Merge changes from topic "reland-64bit-omx" into main am: f67a94c5d8 am: df50b6d36f Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2706715 Change-Id: I569c46a8c7421bb51cbb02d92f74d49a9dd54027 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>