| commit | 1ddf04262375b0293cd689f109a27f58286db797 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Thu Aug 06 20:15:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 20:15:59 2020 +0000 |
| tree | c34e424f7f6d7f85235528243cd8c2475cdaac10 | |
| parent | eaa9add525526536e15d5f108e1cc9b81d8192a3 [diff] | |
| parent | b431027651df26c2aa4177822617316cb9cf5a18 [diff] |
[automerger skipped] [DO NOT MERGE] resolve merge conflicts of f1e06c0a1230356f6fc2ab39a0e56e97f6d65193 to rvc-dev-plus-aosp am: f03824814b -s ours am: b431027651 -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: I1bbf7be122c039ecf9b97206e69faed425dd53fc