[automerger skipped] Merge "Add NDK API for getprocdns,setprocdns" am: a2f8b41020 am: dcc6958cb0 -s ours am: f54700dbce -s ours

Browse Source

am skip reason: Merged-In I42f0d9b17b3058f6e10fd2e651278b290f26667f with SHA-1 86ae725fb9 is already in history

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

Change-Id: I97fbddae9986a6eddec70a41d3036b18fe175de4

...

This commit is contained in:

Remi NGUYEN VAN

2021-06-04 10:53:19 +00:00

committed by Automerger Merge Worker

parent 9ba1512b2d f54700dbce

commit 4fa249dbe5

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