[automerger skipped] Merge changes from topic "QQ3A.200605.002_merge" am: cacd78fef9 am: c149919936 -s ours

Browse Source

am skip reason: Change-Id I0bffe618276cda41bac56efe069121073aa39930 with SHA-1 cb7066ef20 is in history

Original change: https://android-review.googlesource.com/c/platform/cts/+/1325311

Change-Id: Ia22e9f76e718119badf651718cbefcc52e15ebf1

...

This commit is contained in:

Xin Li

2020-06-08 16:08:40 +00:00

committed by Automerger Merge Worker

parent 6b63136923 c149919936

commit c5eb29a331

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