| commit | 73f8f50148b89359208979aadceae099a93ec6b3 | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Mon Aug 03 17:30:47 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 03 17:30:47 2020 +0000 |
| tree | 997ae2036ae2ba1a69dc74869655c13fcf6d541d | |
| parent | f96d0495b7e7ad976f05b541a7f7195e7fc7c6eb [diff] | |
| parent | 7a3434e08ec11a9e3fc0a955b1d61d7798422156 [diff] |
resolve merge conflicts of ae811bc80623da71374c555b51c2dde256b93d4d to rvc-dev-plus-aosp am: 7a3434e08e Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12292179 Change-Id: Idcff7b227f1b709678c0d9c928792db6d28f37f5