aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 03:33:50 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 03:33:50 +0000
commitb05373039c8b315a48a41116fe1ac30d0fcb8f04 (patch)
tree7bce675c949f396b69ee0f6e70e179ac466953cc
parent764c221e2d76372e059e18c2956ff59d2f505a21 (diff)
parent2279862c160e8df21c367e1bcdc42c8a39fc6d33 (diff)
downloadlibcups-b05373039c8b315a48a41116fe1ac30d0fcb8f04.tar.gz
[automerger skipped] Merge Android R am: 67b241e194 -s ours am: 8fba1f6f34 -s ours am: 2279862c16 -s ours
am skip reason: Change-Id I9201aafffe0549b8e13536adb9ff5099dfa91174 with SHA-1 bab090c692 is in history Original change: https://android-review.googlesource.com/c/platform/external/libcups/+/1422372 Change-Id: I62d75dd115035aa67e3a1d61f2bd901d8c230e1a
0 files changed, 0 insertions, 0 deletions