commit | f0afa4c5d8dec3a65c267d2ca816763184c6f131 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 02:03:11 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:03:11 2020 +0000 |
tree | 9e74606ec440cd3574853a87c8117fb351612ae9 | |
parent | 764ef98911fd76c669314a1959ae917c75c5fe7a [diff] | |
parent | 71e27657e903c3cff63780c5289d7ebdc418a25f [diff] |
[automerger skipped] Merge Android R am: 8e91010af9 -s ours am: 71e27657e9 -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: I01370006b53b5a52c4d0072fcbc3c41cdc4858b2