aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merge in nyc-release history after reset to nyc-devandroid-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r1afw-test-harness-2.1nougat-releasenougat-mr0.5-releasenougat-cts-releaseThe Android Automerger2016-06-050-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-04-050-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-290-0/+0
| | |\
| | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-130-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-01-070-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-12-200-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-240-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-230-0/+0
| | | | | | | |\
| | | | | | | | * Merge mnc-dr-enso-dev into master.Narayan Kamath2015-11-232-7/+6
| | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2015-11-230-0/+0
| | | | | | | | |\ | | | | | | | | |/ | | | | | | | |/|
* | | | | | | / | Load libart.so with RTLD_NODELETEnougat-devAlex Light2016-06-031-3/+7
|/ / / / / / / /
* / / / / / / / Add SocketTagger class to JniConstantsYi Kong2016-04-042-0/+3
|/ / / / / / /
* / / / / / / Workaround for apps using a copy of libnativehelperDimitry Ivanov2016-03-282-0/+25
|/ / / / / /
* | | | | | Merge "libnativehelper: remove Android.bp"Colin Cross2016-01-131-5/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge "libnativehelper: remove Android.bp"android-n-preview-1brillo-m9-releasebrillo-m9-devbrillo-m10-releasebrillo-m10-devColin Cross2016-01-121-5/+0
| |\ \ \ \ \
| | * | | | | libnativehelper: remove Android.bpColin Cross2016-01-111-5/+0
| |/ / / / /
* | | | | | Merge "Untie libnativehelper from libcutils"Dimitry Ivanov2016-01-072-8/+10
|\| | | | |
| * | | | | Merge "Untie libnativehelper from libcutils"Dimitry Ivanov2016-01-072-8/+10
| |\ \ \ \ \
| | * | | | | Untie libnativehelper from libcutilsDimitry Ivanov2016-01-062-8/+10
| |/ / / / /
* | / / / / Merge changes from topic \'aosp-merge-24-12\'Narayan Kamath2015-12-240-0/+0
|\| | | | | | |/ / / / |/| | | |
| * | | | Merge changes from topic 'aosp-merge-24-12'Narayan Kamath2015-12-245-9/+183
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Omit AsynchronousCloseMonitor.cpp in host/macosx and ndkPrzemyslaw Szczepaniak2015-12-221-4/+10
| | * | | Move AsynchronousCloseMonitor here from libcorePrzemyslaw Szczepaniak2015-12-223-1/+170
| | * | | Add a JniConstant for InetSocketAddressHolder.Piotr Jastrzebski2015-12-222-0/+3
| | * | | Remove JNI constants related to RealToString.Narayan Kamath2015-12-222-3/+0
| | * | | Track renaming of FileDescriptor field.Narayan Kamath2015-12-221-2/+2
| | * | | Add a JNI constant for InetAddressHolder.Piotr Jastrzebski2015-12-222-0/+3
| | * | | Track usage of OpenJdk's FileDescriptor class.Piotr Jastrzebski2015-12-221-2/+2
| | * | | Track switch to OpenJdk's java.text class.Piotr Jastrzebski2015-12-222-4/+0
| |/ / /
* | | | Omit AsynchronousCloseMonitor.cpp in host/macosx and ndkPrzemyslaw Szczepaniak2015-12-171-4/+10
* | | | Move AsynchronousCloseMonitor here from libcorePrzemyslaw Szczepaniak2015-12-163-1/+170
| |/ / |/| |
* | | Merge mnc-dr-enso-dev into master.Narayan Kamath2015-11-212-7/+6
|\ \ \ | |/ / |/| |
| * | Merge lmp changes into mnc.Narayan Kamath2015-11-122-9/+6
| |\ \
| | * | Add a JniConstant for InetSocketAddressHolder.Piotr Jastrzebski2015-11-092-0/+3
| | * | Remove JNI constants related to RealToString.Narayan Kamath2015-11-092-3/+0
| | * | Track renaming of FileDescriptor field.Narayan Kamath2015-11-091-2/+2
| | * | Add a JNI constant for InetAddressHolder.Piotr Jastrzebski2015-11-092-0/+3
| | * | Track usage of OpenJdk's FileDescriptor class.Piotr Jastrzebski2015-11-091-2/+2
| | * | Track switch to OpenJdk's java.text class.Piotr Jastrzebski2015-11-092-6/+0
* | | | Merge "Improve ScopedFd API"brillo-m8-releasebrillo-m8-devCasey Dahlin2015-11-201-1/+8
|\ \ \ \
| * | | | Improve ScopedFd APICasey Dahlin2015-11-191-1/+8
|/ / / /
* | | | Merge "libnativehelper: add dummy Android.bp file"Colin Cross2015-11-191-0/+5
|\ \ \ \ | |_|_|/ |/| | |
| * | | libnativehelper: add dummy Android.bp fileColin Cross2015-11-191-0/+5
|/ / /
* | | am 6481871f: am 50be0353: Merge "Speed up ScopedPrimitiveArrayRO"Mathieu Chartier2015-09-121-7/+19
|\ \ \
| * \ \ am 50be0353: Merge "Speed up ScopedPrimitiveArrayRO"brillo-m7-releasebrillo-m7-mr-devbrillo-m7-devMathieu Chartier2015-09-121-7/+19
| |\ \ \
| | * \ \ Merge "Speed up ScopedPrimitiveArrayRO"Mathieu Chartier2015-09-121-7/+19
| | |\ \ \
| | | * | | Speed up ScopedPrimitiveArrayROMathieu Chartier2015-09-111-7/+19
| | |/ / /
* | | | | am f8d86500: (-s ours) am 43563581: Merge "Remove jclass constant for Bidi to...Neil Fuller2015-08-270-0/+0
|\| | | |
| * | | | am 43563581: Merge "Remove jclass constant for Bidi to migrate Bidi to ICU4J."Neil Fuller2015-08-181-2/+0
| |\| | |
* | | | | am a8b8f4cc: (-s ours) am 4dcc14c9: Merge "Libnativehelper: Fix unused result...Andreas Gampe2015-08-270-0/+0
|\| | | |