OSDN Git Service

[automerger skipped] Merge Android R am: dd16853a3e -s ours am: 9fd25868fb -s ours...
authorXin Li <delphij@google.com>
Fri, 11 Sep 2020 03:33:26 +0000 (03:33 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 11 Sep 2020 03:33:26 +0000 (03:33 +0000)
am skip reason: Change-Id I7a490c6ba010b984d50bc5eb66e0b7cd0dfb6ff4 with SHA-1 c719aff9b6 is in history

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1422559

Change-Id: I3f35d401f6083522693588b4b0224769ae1e383b


Trivial merge