| commit | 6b1a278d060f991558a7c9d75adb9774f3248a8a | [log] [tgz] |
|---|---|---|
| author | Sungtak Lee <taklee@google.com> | Thu Aug 06 16:56:58 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 06 16:56:58 2020 +0000 |
| tree | 9a6ea7322e8ac934dc88042b879eac15d0054909 | |
| parent | 042b0f020a15987ec783a2961266b16902411fc1 [diff] | |
| parent | 1d5fbadc8bc6295db884e944306ef65bf0ee5eda [diff] |
[DO NOT MERGE] resolve merge conflicts of a57cde11c43cb88048abe6e4b2c202eaec2daadd to rvc-d1-dev-plus-aosp am: 1d5fbadc8b Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12320435 Change-Id: Ic68b59bc1a2fd67bca8d9dd4c8ce860942b5deb0