aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Untie libnativehelper from libcutilsDimitry Ivanov2016-01-062-8/+10
|/
* 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
|/
* 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
|\| |
| * | am 4dcc14c9: Merge "Libnativehelper: Fix unused result warning"Andreas Gampe2015-08-041-4/+18
| |\ \
* | | | am c80b5ffb: (-s ours) am e2f79103: Merge "Use __ANDROID__ instead of HAVE_AN...Elliott Hughes2015-08-270-0/+0
|\| | |
| * | | am e2f79103: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."Elliott Hughes2015-07-312-5/+5
| |\ \ \
* | | | | am 48616867: (-s ours) am f85e32ec: Merge "Replace InetUnixAddress with UnixS...Neil Fuller2015-08-270-0/+0
|\| | | |
| * | | | am f85e32ec: Merge "Replace InetUnixAddress with UnixSocketAddress"Neil Fuller2015-07-092-3/+3
| |\ \ \ \
* | \ \ \ \ am 43563581: Merge "Remove jclass constant for Bidi to migrate Bidi to ICU4J."Neil Fuller2015-08-181-2/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge "Remove jclass constant for Bidi$Run to migrate Bidi to ICU4J."Neil Fuller2015-08-181-2/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Remove jclass constant for Bidi$Run to migrate Bidi to ICU4J.Rayhaan Jaufeerally2015-08-141-2/+0
| |/ / / /
* | | | | am 4dcc14c9: Merge "Libnativehelper: Fix unused result warning"Andreas Gampe2015-08-041-4/+18
|\| | | |
| * | | | Merge "Libnativehelper: Fix unused result warning"android-m-preview-2Andreas Gampe2015-08-041-4/+18
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Libnativehelper: Fix unused result warningAndreas Gampe2015-08-031-4/+18
| |/ / /
* | | | am e2f79103: Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."Elliott Hughes2015-08-012-5/+5
|\| | |
| * | | Merge "Use __ANDROID__ instead of HAVE_ANDROID_OS."Elliott Hughes2015-07-312-5/+5
| |\ \ \ | | |_|/ | |/| |
| | * | Use __ANDROID__ instead of HAVE_ANDROID_OS.Elliott Hughes2015-07-312-5/+5
| |/ /
* | / am f85e32ec: Merge "Replace InetUnixAddress with UnixSocketAddress"Neil Fuller2015-07-092-3/+3
|\| | | |/ |/|
| * Merge "Replace InetUnixAddress with UnixSocketAddress"Neil Fuller2015-07-092-3/+3
| |\
| | * Replace InetUnixAddress with UnixSocketAddressNeil Fuller2015-07-072-3/+3
* | | am 149d1298: Merge "Build libnativehelper as static library"Calin Juravle2015-07-041-0/+21
|\| |
| * | Merge "Build libnativehelper as static library"android-m-preview-1Calin Juravle2015-07-021-0/+21
| |\ \ | | |/ | |/|
| | * Build libnativehelper as static libraryCalin Juravle2015-06-241-0/+21
| |/
* | am b7a25286: ScopedFd: Don\'t use TEMP_FAILURE_RETRY() with close()Spencer Low2015-05-140-0/+0
|\ \
| * | ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1afw-test-harness-1.5marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releaseSpencer Low2015-05-131-2/+5
* | | am 23a733ad: Merge "ScopedFd: Don\'t use TEMP_FAILURE_RETRY() with close()"Elliott Hughes2015-05-141-2/+5
|\ \ \ | |/ / |/| / | |/
| * Merge "ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()"android-m-previewElliott Hughes2015-05-141-2/+5
| |\
| | * ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()Spencer Low2015-05-131-2/+5
| |/
* | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...Prerepa Viswanadham2015-03-240-0/+0
|\ \