tree 745be4970e69cf0f5b54ba1794c883b35867f33a
parent 27ce4df9e5069c7f4117097ba9c04e4ff8189cea
parent 2af05baa77381d88b3b4eaedacd2b7371f65a5d5
author Xin Li <delphij@google.com> 1603220662 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603220662 +0000

[automerger skipped] Merge redfin/bramble support. am: 2af05baa77 -s ours

am skip reason: Change-Id I921547b6666d3287330847cecc60fa08f09e4306 with SHA-1 27ce4df9e5 is in history

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

Change-Id: Ib8be8a39a4ef06dfbdbac5100af5766a9fc4898f