| commit | b431027651df26c2aa4177822617316cb9cf5a18 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Thu Aug 06 20:06:04 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 20:06:04 2020 +0000 |
| tree | 25ebb0075f5b1a855360e6e254ccfee53efc8952 | |
| parent | 079495cc1384ab37160d679655d0185284699cc1 [diff] | |
| parent | f03824814b1969300daa64195178f558980f9547 [diff] |
[automerger skipped] [DO NOT MERGE] resolve merge conflicts of f1e06c0a1230356f6fc2ab39a0e56e97f6d65193 to rvc-dev-plus-aosp am: f03824814b -s ours am skip reason: Change-Id I4f79427ceeaec1b823270bbc8f2513ed28ea8f67 with SHA-1 1d5fbadc8b is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12326733 Change-Id: I519c25181700c8ae7ea5a1ef348dff77b5228fc0