tree f1e2fd205c2fb5df0ef2957b5ea2b7977986d7a7
parent f026cd30589e372c417acc559131f92dc70503bd
parent 8c34163cfacc66165426c9f0c26081510eddbabd
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600263807 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600263807 +0000

Merge "Revert "libcore: Remove native calls in FileDescriptor <clinit>"" into rvc-dev am: c5bf4e3807 am: 67266859ad am: 8c34163cfa

Original change: https://googleplex-android-review.googlesource.com/c/platform/libcore/+/10604244

Change-Id: Iec4c0b87f295e8c1979e449d55d530d5e1d4a57e