| commit | 2857ffd75cddc1ddd6761c35bf88ed01676ee127 | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Thu Aug 06 20:27:07 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 20:27:07 2020 +0000 |
| tree | b237ddaa24fa63735fba088b00d1e29a111da1e1 | |
| parent | ad11b172b7baf367a7a54a24ec6ee916551d1ac8 [diff] | |
| parent | 1ddf04262375b0293cd689f109a27f58286db797 [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: 1ddf042623 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12326733 Change-Id: I8e22553c1019addf066d339c0bd2dfdb98830ed8