[automerger skipped] Merge Android R am: 1136876068 -s ours am: e8d98e4d14 -s ours am: 2c7b6e54c3 -s ours am: 10f108d342 -s ours

Browse Source

am skip reason: Change-Id I33c8b79d82aaaecd05cc1c74f6c6a8613c42fa68 with SHA-1 f9d897c0ce is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1422435

Change-Id: I987f9f5ddfaca47459a2ca64f97a2ec6ca3cc83b

...

This commit is contained in:

Xin Li

2020-09-11 03:59:02 +00:00

committed by Automerger Merge Worker

parent b3a3b0b591 10f108d342

commit a7661d1c68

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available