commit | d3014724c9a602dfee9cbcbfe3cb6819d0b33454 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Thu Dec 24 11:56:44 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Dec 24 11:56:44 2015 +0000 |
tree | db8d3c5de97c9050fdc5154f3f32cbc1a861658b | |
parent | dc8d6a70b3aa36309cfc2acf6ec4b0de2b373d7b [diff] | |
parent | 4957459ac901fb662a08e5f7cee11f529092aeb4 [diff] |
Merge changes from topic 'aosp-merge-24-12' * changes: 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.