[automerger skipped] Fix function return type am: a4ecb890df am: 65ea3565ad -s ours

Browse Source

am skip reason: Merged-In I2336a0c2bf3f71cc0b0bc1ef491a1043e88f359e with SHA-1 33d192d243 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1730079

Change-Id: Icac48bd159d9565077361b878a81e1098bfc7442

...

This commit is contained in:

Greg Kaiser

2021-06-09 03:30:23 +00:00

committed by Automerger Merge Worker

parent ea8ba7a600 65ea3565ad

commit bcbeeeee85

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