summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 29d787b5: am 100386a9: (-s ours) am e0677ccf: Merge "NativeBridge: Tighten...Calin Juravle2014-08-220-0/+0
|\
| * am 100386a9: (-s ours) am e0677ccf: Merge "NativeBridge: Tighten security on ...Calin Juravle2014-08-220-0/+0
| |\
| | * am e0677ccf: Merge "NativeBridge: Tighten security on libnativebridge"Calin Juravle2014-08-229-9/+312
| | |\
| | | * Merge "NativeBridge: Tighten security on libnativebridge"Calin Juravle2014-08-229-9/+312
| | | |\
| | | | * NativeBridge: Tighten security on libnativebridgeAndreas Gampe2014-08-229-9/+312
| | | |/
* | | | am c029f9d2: am 4089cda0: Merge "NativeBridge: Tighten security on libnativeb...Andreas Gampe2014-08-229-9/+313
|\ \ \ \ | |/ / /
| * | | am 4089cda0: Merge "NativeBridge: Tighten security on libnativebridge" into l...Andreas Gampe2014-08-229-9/+313
| |\ \ \
| | * \ \ Merge "NativeBridge: Tighten security on libnativebridge" into lmp-devAndreas Gampe2014-08-229-9/+313
| | |\ \ \
| | | * | | NativeBridge: Tighten security on libnativebridgeAndreas Gampe2014-08-219-9/+313
* | | | | | am 2145a613: Merge branch \'lmp-dev-plus-aosp\' of https://googleplex-android...Isaac Katzenelson2014-08-210-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'lmp-dev-plus-aosp' of https://googleplex-android.googlesource.c...Isaac Katzenelson2014-08-212-4/+4
| |\ \ \ \ \
* | \ \ \ \ \ am 422bffb2: am 0b12f0a7: Merge "processgroup: close directories opened by re...Colin Cross2014-08-211-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 0b12f0a7: Merge "processgroup: close directories opened by removeAllProces...Colin Cross2014-08-211-2/+3
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge "processgroup: close directories opened by removeAllProcessGroups()" in...Colin Cross2014-08-201-2/+3
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | processgroup: close directories opened by removeAllProcessGroups()Colin Cross2014-08-201-2/+3
* | | | | | | am 176fe900: am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open...Elliott Hughes2014-08-212-4/+4
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | am 4592d73e: am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."Elliott Hughes2014-08-212-4/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | am a59b6ac6: Merge "Only the Mac doesn\'t have open_memstream."Elliott Hughes2014-08-212-4/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge "Only the Mac doesn't have open_memstream."Elliott Hughes2014-08-212-4/+4
| | | |\ \ \
| | | | * | | Only the Mac doesn't have open_memstream.Elliott Hughes2014-08-202-4/+4
* | | | | | | am 3601abb8: am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."Elliott Hughes2014-08-203-37/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."Elliott Hughes2014-08-203-37/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 373c7758: Merge "There\'s no non-SMP LP64."Elliott Hughes2014-08-203-37/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "There's no non-SMP LP64."Elliott Hughes2014-08-203-37/+0
| | | |\ \ \ \ | | | | |/ / / | | | |/| | |
| | | | * | | There's no non-SMP LP64.Elliott Hughes2014-08-203-37/+0
| | | |/ / /
* | | | | | am 831789a9: am 6ba555f2: Merge "libutils: Don\'t segfault ProcessCallStack w...Igor Murashkin2014-08-191-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 6ba555f2: Merge "libutils: Don\'t segfault ProcessCallStack when getting t...Igor Murashkin2014-08-191-0/+5
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge "libutils: Don't segfault ProcessCallStack when getting thread name fai...Igor Murashkin2014-08-191-0/+5
| | |\ \ \ \
| | | * | | | libutils: Don't segfault ProcessCallStack when getting thread name failsIgor Murashkin2014-08-191-0/+5
| | | | |_|/ | | | |/| |
* | | | | | am a4c647b6: am 3e3fbc4d: Merge "Update for public android_set_abort_message(...Dan Albert2014-08-190-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 3e3fbc4d: Merge "Update for public android_set_abort_message()." into lmp-devDan Albert2014-08-190-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Update for public android_set_abort_message()." into lmp-devDan Albert2014-08-162-4/+10
| | |\ \ \ \
| | | * | | | Update for public android_set_abort_message().Dan Albert2014-08-192-4/+10
| | | |/ / /
* | | | | | am 8582af78: (-s ours) am 4fe327b9: Merge "Remove inputflinger from init. DO ...Michael Wright2014-08-190-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 4fe327b9: Merge "Remove inputflinger from init. DO NOT MERGE" into lmp-devMichael Wright2014-08-191-7/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Remove inputflinger from init. DO NOT MERGE" into lmp-devMichael Wright2014-08-161-7/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Remove inputflinger from init. DO NOT MERGEMichael Wright2014-08-191-7/+0
* | | | | | am 8c9cbb21: am 5c16eb07: am afc9bc01: Merge "Update for public android_set_a...Dan Albert2014-08-192-4/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 5c16eb07: am afc9bc01: Merge "Update for public android_set_abort_message()."Dan Albert2014-08-192-4/+10
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | am afc9bc01: Merge "Update for public android_set_abort_message()."Dan Albert2014-08-192-4/+10
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge "Update for public android_set_abort_message()."Dan Albert2014-08-162-4/+10
| | | |\ \ \
| | | | * | | Update for public android_set_abort_message().Dan Albert2014-08-182-4/+10
* | | | | | | am 25ec0d4d: am 6310d253: am 8fd1f27e: Merge "Reject zip archives with entry ...Piotr Jastrzebski2014-08-191-1/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 6310d253: am 8fd1f27e: Merge "Reject zip archives with entry names contain...Piotr Jastrzebski2014-08-191-1/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 8fd1f27e: Merge "Reject zip archives with entry names containing \0."Piotr Jastrzebski2014-08-191-1/+7
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Reject zip archives with entry names containing \0."Piotr Jastrzebski2014-08-161-1/+7
| | | |\ \ \ \
| | | | * | | | Reject zip archives with entry names containing \0.Piotr Jastrzebski2014-08-191-1/+7
| | | | |/ / /
* | | | | | | am 134f4436: am f36a2311: am 3e13ed08: Merge "Cleanup ziparchive"Piotr Jastrzebski2014-08-191-3/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am f36a2311: am 3e13ed08: Merge "Cleanup ziparchive"Piotr Jastrzebski2014-08-191-3/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 3e13ed08: Merge "Cleanup ziparchive"Piotr Jastrzebski2014-08-191-3/+4
| | |\ \ \ \ \ | | | |/ / / /