[automerger skipped] Merge "Add atom of TvSettings and its enum" into rvc-dev am: e31edc21a1 am: 3cdcd62e03 -s ours

Browse Source

am skip reason: Change-Id I4258312c19aa4f2f0cd178bc5b5dc53e52c6c737 with SHA-1 0bec8d43a1 is in history

Change-Id: I7fdd69f9e1be54494ec6749f7c68fa33e20a50f7

...

This commit is contained in:

Zhen Sun

2020-04-01 00:00:59 +00:00

committed by Automerger Merge Worker

parent a9b6f95df8 3cdcd62e03

commit 28f2676f86

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