commit | c0efdc2d68609cf5cde59d03b61f3a5e34989a94 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:32 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:32 2020 +0000 |
tree | 9e74606ec440cd3574853a87c8117fb351612ae9 | |
parent | f85cd22a70dc930f7f847aba574e00337c3a66a2 [diff] | |
parent | 62e953e07bd965e6f762f4e2b9a80fe06aa0a021 [diff] |
[automerger skipped] Merge Android R am: 8e91010af9 -s ours am: 71e27657e9 -s ours am: f0afa4c5d8 -s ours am: 62e953e07b -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: I39e608f6ce7b4e53df82cefe1f3f999fea6db548