tree 201c5ea5c4def030650fab9c712ea41bf0ac74e9
parent b246c9543d2abc7d49d1458109f8ec7936f053e0
parent ab6920e9cf5fdcc6e8c04ea9cdddb8659f243bb8
author Xin Li <delphij@google.com> 1599795239 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795239 +0000

[automerger skipped] Merge Android R am: 9ab5c63fe2 -s ours am: 4a3e08bd79 -s ours am: ab6920e9cf -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: I8a862cdb729d6e8fd05295d446ac19a72deb6720