| commit | c468e5ad9d2a6c1bb6085c59cea195c1f2a67898 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Wed Aug 23 22:33:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Aug 23 22:33:03 2023 +0000 |
| tree | 3c1f6b99e108d49fd50bcb47948d4815a099c8dc | |
| parent | 2337e7b5c8e48f77c6657145a35414dea9de4f49 [diff] | |
| parent | bd6c62b7398259a5a9803f14edfb90509dab8d23 [diff] |
[conflict] Merge changes from topic "reland-64bit-omx" into main am: f67a94c5d8 am: df50b6d36f am: bd6c62b739 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/24528468 Change-Id: Ide3a66b775a19704950d1573e4d1eb8cc7528326 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>