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 02:02:34 +0000 (02:02 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 11 Sep 2020 02:02:34 +0000 (02:02 +0000)
commit17012f128beb70793f40c658ceedcddcd0d8e059
treebca04ce2bdfc4231972291cd7a279dc6a4305299
parent89a086f463216b6c63263d64268918522ece108a
parent9fd25868fb3c7ed7c10bbcb97f4bf4c5636a6dcf
[automerger skipped] Merge Android R am: dd16853a3e -s ours am: 9fd25868fb -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: Ic06f509fc7e800ceef6d8a5d0c3d35effe6174d3