aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-5.1.0_r1' into HEADstaging/cm-12.1stable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Ccm-12.1Ricardo Cerqueira2015-03-105-28/+46
|\
| * NativeHelper: Avoid returning local stack stringNingsheng Jian2014-09-295-28/+46
* | libnativehelper: Fix modern Xcode & OSX compilationstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.0Scott Mertz2015-01-151-0/+3
|/
* NativeHelper: Switch to Clangstaging/cm-12.0-cafAndreas Gampe2014-08-262-0/+5
* NativeHelper: Do not allow arbitrary library strings in user buildsAndreas Gampe2014-08-255-4/+208
* am 1720265c: am b37e11d0: Merge "libnativehelper: Remove an unused NDK-only t...Elliott Hughes2014-06-301-19/+0
|\
| * am b37e11d0: Merge "libnativehelper: Remove an unused NDK-only target"Elliott Hughes2014-06-301-19/+0
| |\
| | * Merge "libnativehelper: Remove an unused NDK-only target"Elliott Hughes2014-06-271-19/+0
| | |\
| | | * libnativehelper: Remove an unused NDK-only targetSam Hasinoff2014-06-301-19/+0
| | |/
* | | am da7f0439: am 3fa23a6b: Merge "Fixing PrintWriter not being disposed"Elliott Hughes2014-06-271-4/+4
|\| |
| * | am 3fa23a6b: Merge "Fixing PrintWriter not being disposed"Elliott Hughes2014-06-271-4/+4
| |\|
| | * Merge "Fixing PrintWriter not being disposed"Elliott Hughes2014-06-261-4/+4
| | |\
| | | * Fixing PrintWriter not being disposedHuanqi Chen2014-06-271-4/+4
| | |/
* | | am 0e2c05c1: am 83fe0ad3: Merge "Add reset to ScopedFd."Ian Rogers2014-06-231-3/+8
|\| |
| * | am 83fe0ad3: Merge "Add reset to ScopedFd."Ian Rogers2014-06-231-3/+8
| |\|
| | * Merge "Add reset to ScopedFd."Ian Rogers2014-06-201-3/+8
| | |\
| | | * Add reset to ScopedFd.Ian Rogers2014-06-211-3/+8
* | | | am 1e01ac68: am 689a91a6: Merge "Host multilib for multilib ART support."Ian Rogers2014-06-221-0/+1
|\| | |
| * | | am 689a91a6: Merge "Host multilib for multilib ART support."Ian Rogers2014-06-221-0/+1
| |\| |
| | * | Merge "Host multilib for multilib ART support."Ian Rogers2014-06-221-0/+1
| | |\ \ | | | |/ | | |/|
| | | * Host multilib for multilib ART support.Ian Rogers2014-06-161-0/+1
| | |/
* | | am 3a620bf9: am 19f6fb99: am c72d0515: Merge "Move to dalvik.vm.lib.2 to forc...Brian Carlstrom2014-05-280-0/+0
|\| |
| * | am 19f6fb99: am c72d0515: Merge "Move to dalvik.vm.lib.2 to force default to ...Brian Carlstrom2014-05-281-1/+1
| |\|
| | * am c72d0515: Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| | |\
| | | * Merge "Move to dalvik.vm.lib.2 to force default to libart"Brian Carlstrom2014-05-281-1/+1
| | | |\
| | | | * Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
| | | |/
* | | | Move to dalvik.vm.lib.2 to force default to libartBrian Carlstrom2014-05-281-1/+1
* | | | merge in master-release history after reset to e9a01e6fb2431122afd4476932c139...The Android Automerger2014-05-220-0/+0
|\ \ \ \
| * | | | merge in master-release history after reset to e9a01e6fb2431122afd4476932c139...The Android Automerger2014-05-220-0/+0
|/| | | |
| * | | | merge in master-release history after reset to 62c60b9a9fc2a9e97b4576257676f1...The Android Automerger2014-05-210-0/+0
| |\ \ \ \
| | * | | | merge in master-release history after reset to 62c60b9a9fc2a9e97b4576257676f1...The Android Automerger2014-05-200-0/+0
| |/| | | |
| | * | | | merge in master-release history after reset to 62c60b9a9fc2a9e97b4576257676f1...The Android Automerger2014-05-190-0/+0
| |/| | | |
| | * | | | merge in master-release history after reset to 62c60b9a9fc2a9e97b4576257676f1...The Android Automerger2014-05-180-0/+0
| |/| | | |
| | * | | | merge in master-release history after reset to 62c60b9a9fc2a9e97b4576257676f1...The Android Automerger2014-05-170-0/+0
| |/| | | |
| | * | | | merge in master-release history after reset to a7104a806f863fd5a88cac4aed10c3...The Android Automerger2014-05-150-0/+0
| | |\ \ \ \
| | | * | | | merge in master-release history after reset to a7104a806f863fd5a88cac4aed10c3...The Android Automerger2014-05-140-0/+0
| | |/| | | |
| | | * | | | merge in master-release history after reset to 8c6319e0194b3f6f4695d3553fc350...The Android Automerger2014-05-130-0/+0
| | | |\ \ \ \
| | | | * | | | merge in master-release history after reset to 8c6319e0194b3f6f4695d3553fc350...The Android Automerger2014-05-120-0/+0
| | | |/| | | |
| | | | * | | | merge in master-release history after reset to 8c6319e0194b3f6f4695d3553fc350...The Android Automerger2014-05-110-0/+0
| | | |/| | | |
| | | | * | | | merge in master-release history after reset to 8c6319e0194b3f6f4695d3553fc350...The Android Automerger2014-05-100-0/+0
| | | |/| | | |
| | | | * | | | merge in master-release history after reset to 8c6319e0194b3f6f4695d3553fc350...The Android Automerger2014-05-080-0/+0
| | | |/| | | |
| | | | * | | | merge in master-release history after reset to 23711d76cc3d52e4949c9c53d73a7d...The Android Automerger2014-05-070-0/+0
| | | | |\ \ \ \
| | | | | * | | | merge in master-release history after reset to 23711d76cc3d52e4949c9c53d73a7d...The Android Automerger2014-05-070-0/+0
| | | | |/| | | |
| | | | | * | | | merge in master-release history after reset to 23711d76cc3d52e4949c9c53d73a7d...The Android Automerger2014-05-060-0/+0
| | | | |/| | | |
| | | | | * | | | merge in master-release history after reset to 23711d76cc3d52e4949c9c53d73a7d...The Android Automerger2014-05-050-0/+0
| | | | |/| | | |
| | | | | * | | | merge in master-release history after reset to 23711d76cc3d52e4949c9c53d73a7d...The Android Automerger2014-05-040-0/+0
| | | | |/| | | |
| | | | | * | | | merge in master-release history after reset to 23711d76cc3d52e4949c9c53d73a7d...The Android Automerger2014-05-030-0/+0
| | | | |/| | | |
| | | | | * | | | merge in master-release history after reset to e912352008df41eacbe0ac1f182825...The Android Automerger2014-05-010-0/+0
| | | | | |\ \ \ \
| | | | | | * \ \ \ merge in master-release history after reset to bda8dcdf5afe544cc26f44cb0418f7...The Android Automerger2014-04-300-0/+0
| | | | | | |\ \ \ \
| | | | | | | * | | | merge in master-release history after reset to bda8dcdf5afe544cc26f44cb0418f7...The Android Automerger2014-04-290-0/+0
| | | | | | |/| | | |