commit | db2e1988076c90f66eb9434acaea36e30e2de125 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:12 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:12 2020 +0000 |
tree | f1aeb7cd995e6bc74c67f636e0f1c821b6e0bd93 | |
parent | b7fb1e8cba45f13ea5699f711ae5d63709992d53 [diff] | |
parent | 7ef4baca30d66ca178e0789b4fde8ab5a28ecfb7 [diff] |
[automerger skipped] Merge Android R am: 544c4429fb -s ours am: 69f64580a8 -s ours am: 7ef4baca30 -s ours am skip reason: Change-Id I05bf001a541c36cea285a3ee33b0ede8403c271d with SHA-1 412223d76f is in history Original change: https://android-review.googlesource.com/c/platform/system/hwservicemanager/+/1422557 Change-Id: Id65e5a635815fb9c1c749514d019c9861ec5a66b