commit | ae9fa4dec75a143e272b22b6bba3c952d6ce4f9f | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:40 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:40 2020 +0000 |
tree | 9e74606ec440cd3574853a87c8117fb351612ae9 | |
parent | f9a9c01f7a6d6984b74aad68329a57745fbf8ca8 [diff] | |
parent | c06b8cfedd611c15e2aa8e2dc1a2531ed94625a2 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 11fdc44c1e am: c06b8cfedd -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: If903c2222bbfc00b4988b9e81265a9863951270f