| commit | 014329700f406612f080b6f6cc11b576f4079d7a | [log] [tgz] |
|---|---|---|
| author | Lajos Molnar <lajos@google.com> | Mon Aug 03 17:54:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 03 17:54:28 2020 +0000 |
| tree | 23af0350f6a4e3c7c27962a03428283669471396 | |
| parent | b2cf1ccc9cc98fc220eead98ff5724ca86b881db [diff] | |
| parent | 1a47a02f72e6d6d699653e11154da99384b728e0 [diff] |
resolve merge conflicts of ae811bc80623da71374c555b51c2dde256b93d4d to rvc-dev-plus-aosp am: 7a3434e08e am: 73f8f50148 am: 1a47a02f72 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12292179 Change-Id: I5efe72efc1fa4e76d24e4bc727a138bff640c43c