Commit 6f126c7c authored by Narayan Kamath's avatar Narayan Kamath Committed by android-build-merger
Browse files

Merge changes from topic \'aosp-merge-24-12\'

am: d3014724

* commit 'd3014724':
  Omit AsynchronousCloseMonitor.cpp in host/macosx and ndk
  Move AsynchronousCloseMonitor here from libcore
  Add a JniConstant for InetSocketAddressHolder.
  Remove JNI constants related to RealToString.
  Track renaming of FileDescriptor field.
  Add a JNI constant for InetAddressHolder.
  Track usage of OpenJdk's FileDescriptor class.
  Track switch to OpenJdk's java.text class.
parents 7b7052ef d3014724
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment