commit | ae2b4a6d524b417f4f8c349551926b0658c07cbd | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:59:07 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:59:07 2020 +0000 |
tree | 2bcd01f195adaa9a8bedc3c49343bb77735234f9 | |
parent | 70258f4dd160fdce46d1abbaae079db035224360 [diff] | |
parent | ffcc76756236cf608b16122d3f603547f7221e30 [diff] |
[automerger skipped] Merge Android R am: b68ac114f8 -s ours am: 835efccc5e -s ours am: dbab1c4429 -s ours am: ffcc767562 -s ours am skip reason: Change-Id I11c4aae11395a7bf8f92574af746f7af3687a216 with SHA-1 f48ff0ad05 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/car/services/+/1422397 Change-Id: Ia9db94b64400267bb015ad90ec006bbbb3811943