aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ScopedFd: Don't use TEMP_FAILURE_RETRY() with close()HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0Spencer Low2015-05-131-2/+5
* Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release' into m...Prerepa Viswanadham2015-03-240-0/+0
|\
| * Add JNI references for PacketSocketAddress.Lorenzo Colitti2015-03-162-5/+7
* | am eb586ce3: (-s ours) reset to lmp-mr1-dev-plus-aosp with history. DO NOT ME...Qiwen Zhao2015-03-220-0/+0
|\ \
| * \ reset to lmp-mr1-dev-plus-aosp with history. DO NOT MERGE ANYWHERE.Qiwen Zhao2015-03-200-0/+0
| |\ \
| | * \ am f6f911f9: am b05d350b: NativeHelper: Switch to ClangAndreas Gampe2015-03-200-0/+0
| | |\ \
| | * \ \ am 2ac3db2a: am e2564566: Merge "NativeHelper: Do not allow arbitrary library...Andreas Gampe2015-03-200-0/+0
| | |\ \ \
| | * \ \ \ am 06de3def: am 5019faa3: NativeHelper: Do not allow arbitrary library string...Andreas Gampe2015-03-200-0/+0
| | |\ \ \ \
| | * \ \ \ \ am 8e159d3a: am b14825c7: Merge "Fix libnativehelper strerror_r build break."Elliott Hughes2015-03-201-0/+5
| | |\ \ \ \ \
* | | | | | | | am e3301463: Merge "Add JNI references for PacketSocketAddress."Lorenzo Colitti2015-03-162-5/+7
|\| | | | | | |
| * | | | | | | Merge "Add JNI references for PacketSocketAddress."Lorenzo Colitti2015-03-162-5/+7
| |\ \ \ \ \ \ \
| | * | | | | | | Add JNI references for PacketSocketAddress.Lorenzo Colitti2015-03-122-5/+7
| |/ / / / / / /
* | | | | | | | Merge remote-tracking branch 'goog/mirror-m-wireless-internal-release'Vinit Deshpande2015-03-160-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Add JNI references for android.system.NetlinkSocketAddress.Erik Kline2015-03-122-0/+3
| | |/ / / / / | |/| | | | |
* | | | | | | am e899b7ef: am f5b03ea8: Merge "Add JNI references for android.system.Netlin...Erik Kline2015-03-110-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am f5b03ea8: Merge "Add JNI references for android.system.NetlinkSocketAddress."Erik Kline2015-03-102-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Add JNI references for android.system.NetlinkSocketAddress."Erik Kline2015-03-102-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | Add JNI references for android.system.NetlinkSocketAddress.Erik Kline2015-02-252-0/+3
| | |/ / / / / /
* | / / / / / / am f5b03ea8: Merge "Add JNI references for android.system.NetlinkSocketAddress."Erik Kline2015-03-102-0/+3
|/ / / / / / /
* | | | | | | am fb1ca0c7: Merge "Rename field: fd -> fd_"Dmitriy Ivanov2015-01-201-8/+8
|\| | | | | |
| * | | | | | Merge "Rename field: fd -> fd_"Dmitriy Ivanov2015-01-201-8/+8
| |\ \ \ \ \ \
| | * | | | | | Rename field: fd -> fd_Dmitriy Ivanov2015-01-201-8/+8
| |/ / / / / /
* | | | | | | am e20cfd97: Merge "Add Class<java.util.zip.ZipEntry> to JniConstants."Narayan Kamath2015-01-162-0/+3
|\| | | | | |
| * | | | | | Merge "Add Class<java.util.zip.ZipEntry> to JniConstants."Narayan Kamath2015-01-162-0/+3
| |\ \ \ \ \ \
| | * | | | | | Add Class<java.util.zip.ZipEntry> to JniConstants.Narayan Kamath2015-01-082-0/+3
| |/ / / / / /
* | | | | | | am c2fadae1: Merge "Move libnativehelper to libc++."Dan Albert2014-11-171-1/+0
|\| | | | | |
| * | | | | | Merge "Move libnativehelper to libc++."Dan Albert2014-11-171-1/+0
| |\ \ \ \ \ \
| | * | | | | | Move libnativehelper to libc++.Dan Albert2014-11-151-1/+0
| |/ / / / / /
* | | | | | | am b17837a1: am 09924a0d: Merge "Don\'t need swap anymore."Dan Albert2014-11-051-10/+0
|\| | | | | |
| * | | | | | am 09924a0d: Merge "Don\'t need swap anymore."Dan Albert2014-11-051-10/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "Don't need swap anymore."Dan Albert2014-11-051-10/+0
| | |\ \ \ \ \ \
| | | * | | | | | Don't need swap anymore.Dan Albert2014-11-051-10/+0
| | |/ / / / / /
* | | | | | | | am 3becb24e: am b99e26cd: Merge "Add DISALLOW_COPY_AND_ASSIGN macro."Ian Rogers2014-11-0510-42/+38
|\| | | | | | |
| * | | | | | | am b99e26cd: Merge "Add DISALLOW_COPY_AND_ASSIGN macro."Ian Rogers2014-11-0410-42/+38
| |\| | | | | |
| | * | | | | | Merge "Add DISALLOW_COPY_AND_ASSIGN macro."Ian Rogers2014-11-0410-42/+38
| | |\ \ \ \ \ \
| | | * | | | | | Add DISALLOW_COPY_AND_ASSIGN macro.Ian Rogers2014-11-0410-42/+38
| | |/ / / / / /
* | | | | | | | am a75fb2a6: NativeHelper: Avoid returning local stack stringNingsheng Jian2014-10-280-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | NativeHelper: Avoid returning local stack stringNingsheng Jian2014-09-295-28/+46
* | | | | | | | am c53defb5: am 221e49a1: Merge "NativeHelper: Avoid returning local stack st...Andreas Gampe2014-10-270-0/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | am 221e49a1: Merge "NativeHelper: Avoid returning local stack string"Andreas Gampe2014-09-295-28/+46
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
* | | | | | | | am 7a52b273: am d318f9e0: Merge "NativeHelper: Switch to Clang"Andreas Gampe2014-10-270-0/+0
|\| | | | | | |
| * | | | | | | am d318f9e0: Merge "NativeHelper: Switch to Clang"Andreas Gampe2014-09-290-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ am 221e49a1: Merge "NativeHelper: Avoid returning local stack string"Andreas Gampe2014-09-295-28/+46
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge "NativeHelper: Avoid returning local stack string"Andreas Gampe2014-09-295-28/+46
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | NativeHelper: Avoid returning local stack stringNingsheng Jian2014-09-295-28/+46
| |/ / / / / / /
* | / / / / / / am d318f9e0: Merge "NativeHelper: Switch to Clang"Andreas Gampe2014-09-290-0/+0
|\| | | | | | | | |/ / / / / / |/| | | | | |
| * | | | | | Merge "NativeHelper: Switch to Clang"Andreas Gampe2014-09-282-0/+5
| |\ \ \ \ \ \
| | * | | | | | NativeHelper: Switch to ClangAndreas Gampe2014-09-272-0/+5
* | | | | | | | am dadadb3d: Merge "Don\'t manually link stlport."Dan Albert2014-09-261-2/+3
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Merge "Don't manually link stlport."Dan Albert2014-09-261-2/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |