aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-09-11 03:59:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-09-11 03:59:21 +0000
commite3275547e88a4318063cf7817d43da4f1616e540 (patch)
tree7bce675c949f396b69ee0f6e70e179ac466953cc
parent962b53d74a94c01b91ee32b69285a1faaa54ba02 (diff)
parentb05373039c8b315a48a41116fe1ac30d0fcb8f04 (diff)
downloadlibcups-e3275547e88a4318063cf7817d43da4f1616e540.tar.gz
[automerger skipped] Merge Android R am: 67b241e194 -s ours am: 8fba1f6f34 -s ours am: 2279862c16 -s ours am: b05373039c -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: Iedac4ae2a9b1772c616237b3c14d1fd24ee29653
0 files changed, 0 insertions, 0 deletions