| commit | 849600324557e5c5484f15054457ae2ce9a24c44 | [log] [tgz] |
|---|---|---|
| author | Jared Duke <jdduke@google.com> | Thu Mar 31 23:22:12 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Mar 31 23:22:12 2022 +0000 |
| tree | 72e915ac20a4994edbd1d0129b4573ce14905822 | |
| parent | e0bb053ef0bd8e1b6ad51d84babe8053d5063a6a [diff] | |
| parent | e9c7689391c6531550f6bc6180725f14b16ea6cf [diff] |
Merge "Fix static lib collision between system_server + framework" am: a6f4bbd418 am: e9c7689391 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2050305 Change-Id: Ib370572baa0f44a0236a8de0157573a9ea700d45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>