[automerger skipped] Merge "Add footer preference into caption preferences" into qt-r1-dev am: 5fc6db2cf7

Browse Source

am: 08be6c4a84 -s ours
am skip reason: change_id I95e0aa301eba7343fbc798cc406c0242f4f4eb7e with SHA1 8f4b8b9a74 is in history

Change-Id: Ic3153cef6f388c59f30a283cc47db435c774ab73

...

This commit is contained in:

Kevin Chang

2019-07-18 01:16:18 -07:00

committed by android-build-merger

parent 5f7a01d9d5 08be6c4a84

commit aae770eda5

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