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