commit | 0d38934431be8a22153620f209f8f21de2c036a6 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:30 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:30 2020 +0000 |
tree | 201c5ea5c4def030650fab9c712ea41bf0ac74e9 | |
parent | 3e50e89e1258df55083f9b59db5f2f0e14510fa2 [diff] | |
parent | 8c2476e53037531496fc413fda07caf1b25d58ae [diff] |
[automerger skipped] Merge Android R am: 9ab5c63fe2 -s ours am: 4a3e08bd79 -s ours am: ab6920e9cf -s ours am: 8c2476e530 -s ours am skip reason: Change-Id I904a49116f122667bf0a0ac3017e718962cb1f2d with SHA-1 3fec5d8276 is in history Original change: https://android-review.googlesource.com/c/platform/external/setupcompat/+/1422386 Change-Id: I15d07179630690a821de16af0ce3b67e731fc2eb