| commit | 256dff73a8bc5fa2f8941a29aac4e401f992b5c3 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:09 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:09 2020 +0000 |
| tree | 9e74606ec440cd3574853a87c8117fb351612ae9 | |
| parent | 9fe651e98c95edf7422b3727fc01b145c5084fab [diff] | |
| parent | 83b89e47a04d3e8c70eb42a44e5d2f0703f0c77d [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 11fdc44c1e am: c06b8cfedd -s ours am: ae9fa4dec7 -s ours am: 83b89e47a0 -s ours am skip reason: Change-Id I439dcaaa34979adff8ca260774e9b72833b5f291 with SHA-1 f9a9c01f7a is in history Original change: https://android-review.googlesource.com/c/platform/packages/services/BuiltInPrintService/+/1431593 Change-Id: I785e80c0e4d41ae65a155a0564873aef82d4b056