| commit | a15e63bc72578d540d9e094d3791b7427a415ad3 | [log] [tgz] |
|---|---|---|
| author | Peiyong Lin <lpy@google.com> | Thu Nov 02 18:21:09 2023 +0000 |
| committer | Peiyong Lin <lpy@google.com> | Thu Nov 02 18:31:52 2023 +0000 |
| tree | 19ddeb373c28cbdff366d0a2cf2e2facb939cb16 | |
| parent | dfe9f6023d6883fb6ad68e0217644e748d3cab9d [diff] | |
| parent | 826244e86737d09e29aa7e6af11d49e51d9117ce [diff] |
[conflict] Merge "Make ANGLE loadable from system image." into main am: 08efa6ba00 am: 99fecf1fae am: 826244e867 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2797326 Change-Id: I489ec7015dccd828df4bccccb05575bb849a17cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>