tree 9e74606ec440cd3574853a87c8117fb351612ae9
parent 15faefbf04a11c2aa9c79ed42daca97fbac9615d
parent f0afa4c5d8dec3a65c267d2ca816763184c6f131
author Xin Li <delphij@google.com> 1599795242 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795242 +0000

[automerger skipped] Merge Android R am: 8e91010af9 -s ours am: 71e27657e9 -s ours am: f0afa4c5d8 -s ours

am skip reason: Change-Id I304c9380ef53b720858f4b094addf677f06c8e99 with SHA-1 5e8c28d05e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/services/BuiltInPrintService/+/1422480

Change-Id: I0fedfbb6bcddbd5b36f22d26c41b2380d6bfcf68