| commit | e2515f6a57afa001cacaf6a346b741413c848acc | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <[email protected]> | Thu May 04 19:45:32 2023 +0000 |
| committer | Automerger Merge Worker <[email protected]> | Thu May 04 19:45:32 2023 +0000 |
| tree | 39efdee029b697a22cd7003e21bf48be9e0146ec | |
| parent | 0b0e3dd01b9d96c10cda406ee0eef84336027ea0 [diff] | |
| parent | 0d4308ff0c7293e9c7af92589fc0fa75e18971f8 [diff] |
Merge "hwui: Fix multiple definitions of NativeFamilyBuilder" am: 579363b7c4 am: b9bf672193 am: 793b15bc1a am: 663b7ef76c am: 87140bf707 am: 0d4308ff0c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2576970 Change-Id: I8ce42669467f4f7448ccc0ba22d98bb573044d23 Signed-off-by: Automerger Merge Worker <[email protected]>