tree f1a52aa5b18ad81567c52490b2ed3023f01bf1cf
parent e4ddf1a35b0a233762722f3a9cb5a806878ba9e7
parent 505c09f86c3d635179c164815d06b3b4dc73d6e0
author TreeHugger Robot <treehugger-gerrit@google.com> 1598553250 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598553250 +0000

[automerger skipped] Merge "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master am: da0032b745 -s ours

am skip reason: Change-Id I4ed607532816d1f3f9075368f55017b97251ade8 with SHA-1 d57f303b46 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/net/+/12469946

Change-Id: I74280a96cd04efe39d5b5eda1077c14a67f780fb