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)
commitfb462ecde78ee97d87be8551f475ee6102964452
treebca04ce2bdfc4231972291cd7a279dc6a4305299
parent993888e78d9de14566806f95e882de18d392ff87
parent17012f128beb70793f40c658ceedcddcd0d8e059
[automerger skipped] Merge Android R am: dd16853a3e -s ours am: 9fd25868fb -s ours am: 17012f128b -s ours

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