| commit | 149c4a6ff533f255f7a6fad39a4f628af29b5f0d | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:58:43 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:58:43 2020 +0000 |
| tree | f1aeb7cd995e6bc74c67f636e0f1c821b6e0bd93 | |
| parent | 6e9cb4e380181394bc3602d29aa4a504f9623b4d [diff] | |
| parent | db2e1988076c90f66eb9434acaea36e30e2de125 [diff] |
[automerger skipped] Merge Android R am: 544c4429fb -s ours am: 69f64580a8 -s ours am: 7ef4baca30 -s ours am: db2e198807 -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: Ida2a52a194207567c6bf34d521cc1dddb3179037