commit | 000d37e1a93ad5854ca8780b4ef1834e114d6a89 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 14 21:51:01 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 14 21:51:01 2020 +0000 |
tree | 9e74606ec440cd3574853a87c8117fb351612ae9 | |
parent | 62e953e07bd965e6f762f4e2b9a80fe06aa0a021 [diff] | |
parent | f9a9c01f7a6d6984b74aad68329a57745fbf8ca8 [diff] |
[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: af4f00640d -s ours am: f9a9c01f7a -s ours am skip reason: Change-Id I01370006b53b5a52c4d0072fcbc3c41cdc4858b2 with SHA-1 f0afa4c5d8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/BuiltInPrintService/+/12579475 Change-Id: I4623cc72427764efccfbf8a673684765e06b77d8