Merge "resolve merge conflicts of 3e58f238d938826100c74ab20306742ddc55fb63 to sc-v2-dev-plus-aosp" into sc-v2-dev-plus-aosp am: beb7b74ded

Browse source

Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/15175691

Change-Id: Ia9d1f829a816abe2c5cd034a2cd59dafa7e1f8f7

...

This commit is contained in:

TreeHugger Robot 2021-07-02 16:07:40 +00:00 • committed by Automerger Merge Worker

parent 42427d4d3f b87a00e3c2

commit cf8ce3f6e1

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 is not available