[automerger skipped] Merge "Remove the dependency of dnsresolver_aidl_interface-java" am: 9e3abef9b3 am: 09f0c84074 -s ours am: 92ce1cd65b -s ours am: 9c81a2a24d -s ours

Browse Source

am skip reason: Merged-In Id229f68404ddf50a5ed8da800a3dbe8acead2d20 with SHA-1 937595cf2b is already in history

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

Change-Id: I8d433cc8009da0cdef7d3ff9a6e37866ffcaa932

...

This commit is contained in:

Lucas Lin

2021-07-09 04:10:53 +00:00

committed by Automerger Merge Worker

parent e65b5f1ef4 9c81a2a24d

commit a288f21985

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