| commit | 6f126c7cf8addde2ddb93c354dfeed8b4df29913 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Thu Dec 24 12:05:03 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Dec 24 12:05:03 2015 +0000 |
| tree | db8d3c5de97c9050fdc5154f3f32cbc1a861658b | |
| parent | 7b7052ef86e8362857e322e9ce7f73f02f34200f [diff] | |
| parent | d3014724c9a602dfee9cbcbfe3cb6819d0b33454 [diff] |
Merge changes from topic \'aosp-merge-24-12\' am: d3014724c9 * commit 'd3014724c9a602dfee9cbcbfe3cb6819d0b33454': 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.