[automerger skipped] Merge "Support blink scan" am: 1d4bf166d4 am: c067dc9979 am: 0a9f4b4ff0 -s ours

Browse Source

am skip reason: Change-Id Iec5ba453b3d3d40c0d96fda5c7288b79898d9aea with SHA-1 e18379f5d1 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I90c0612d1eb5b92a3a2c5642356c27df4c334c3a

...

This commit is contained in:

Treehugger Robot

2020-12-31 00:45:39 +00:00

committed by Automerger Merge Worker

parent 6a55d862e0 0a9f4b4ff0

commit 5ad443c852

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