summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | resolved conflicts for merge of 41b797de to masterKenny Root2014-06-112-70/+68
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am c720a12a: am e2d5a3b4: Merge "Switch md5 over to openssl rather than libc."Elliott Hughes2014-06-092-68/+66
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am e2d5a3b4: Merge "Switch md5 over to openssl rather than libc."Elliott Hughes2014-06-092-68/+66
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "Switch md5 over to openssl rather than libc."Elliott Hughes2014-06-092-68/+66
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Switch md5 over to openssl rather than libc.Elliott Hughes2014-06-092-68/+66
* | | | | | am 6d7649b6: Merge "Add missing headers" into lmp-preview-devBrian Carlstrom2014-06-110-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge "Add missing headers" into lmp-preview-devBrian Carlstrom2014-06-102-0/+2
| |\ \ \ \ \ \
| | * | | | | | Add missing headersDan Albert2014-06-092-0/+2
* | | | | | | | am 8c170ef7: Merge "Remove libstdc++ dependency from host libbacktrace" into ...Brian Carlstrom2014-06-110-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Remove libstdc++ dependency from host libbacktrace" into lmp-preview-devBrian Carlstrom2014-06-101-0/+3
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Remove libstdc++ dependency from host libbacktraceDan Albert2014-06-091-0/+3
* | | | | | | | am 72299bf0: [Bug]NE when playing mp3 with incorrect UTF16 charCylen Yao2014-06-111-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | [Bug]NE when playing mp3 with incorrect UTF16 charCylen Yao2014-06-101-1/+2
| |/ / / / / /
* | | | | | | Add gtest conformance tests for libsync. Not complete yet, but substantially ...Riley Andrews2014-06-102-0/+646
| |_|_|_|_|/ |/| | | | |
* | | | | | Uniformly escape shell arguments.Jeff Sharkey2014-06-101-40/+25
* | | | | | am c24b98c7: (-s ours) Add a couple of useful string functions. (DO NOT MERGE)Jeff Brown2014-06-100-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add a couple of useful string functions. (DO NOT MERGE)Jeff Brown2014-06-092-0/+37
* | | | | | Merge "Add a couple of useful string functions."Jeff Brown2014-06-092-0/+37
|\ \ \ \ \ \
| * | | | | | Add a couple of useful string functions.Jeff Brown2014-06-092-0/+37
* | | | | | | am 08511d6e: Make host ashmem_create_region seed only once.Mathieu Chartier2014-06-090-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Make host ashmem_create_region seed only once.Mathieu Chartier2014-06-062-71/+73
* | | | | | | am f3af14e6: am ef47eb19: am 30136150: Merge "adb: avoid leaking file descrip...Nick Kralevich2014-06-071-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am ef47eb19: am 30136150: Merge "adb: avoid leaking file descriptors"Nick Kralevich2014-06-071-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | am 30136150: Merge "adb: avoid leaking file descriptors"Nick Kralevich2014-06-061-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge "adb: avoid leaking file descriptors"Nick Kralevich2014-06-061-1/+1
| | | |\ \ \
| | | | * | | adb: avoid leaking file descriptorsNick Kralevich2014-06-051-1/+1
* | | | | | | am f6d8dedd: am 8af98621: am 5db5b8aa: Merge "Port libcutils memset16/32 to x...Christopher Ferris2014-06-064-16/+994
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 8af98621: am 5db5b8aa: Merge "Port libcutils memset16/32 to x86_64."Christopher Ferris2014-06-064-16/+994
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 5db5b8aa: Merge "Port libcutils memset16/32 to x86_64."Christopher Ferris2014-06-064-16/+994
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Port libcutils memset16/32 to x86_64."Christopher Ferris2014-06-064-16/+994
| | | |\ \ \ \
| | | | * | | | Port libcutils memset16/32 to x86_64.Henrik Smiding2014-06-054-16/+994
| | | | |/ / /
* | | | | | | am b311ca9e: Add LD_PRELOAD for libsigchain.so to the environmentDave Allison2014-06-060-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Add LD_PRELOAD for libsigchain.so to the environmentDave Allison2014-06-021-0/+1
* | | | | | | am 6a5b8cf5: am 02de7d7a: am ae8f67d7: Merge "logd: logcat unexpected EOF on ...Mark Salyzyn2014-06-061-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 02de7d7a: am ae8f67d7: Merge "logd: logcat unexpected EOF on slow consoles"Mark Salyzyn2014-06-061-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am ae8f67d7: Merge "logd: logcat unexpected EOF on slow consoles"Mark Salyzyn2014-06-061-0/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "logd: logcat unexpected EOF on slow consoles"Mark Salyzyn2014-06-061-0/+1
| | | |\ \ \ \
| | | | * | | | logd: logcat unexpected EOF on slow consolesMark Salyzyn2014-06-061-0/+1
| | | |/ / / /
* | | | | | | am 5ceec65d: am de3ff60d: am b7b92ae2: Merge "Fix build."Narayan Kamath2014-06-061-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am de3ff60d: am b7b92ae2: Merge "Fix build."Narayan Kamath2014-06-061-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am b7b92ae2: Merge "Fix build."Narayan Kamath2014-06-061-2/+2
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Fix build."Narayan Kamath2014-06-061-2/+2
| | | |\ \ \ \
| | | | * | | | Fix build.Narayan Kamath2014-06-061-2/+2
| | | |/ / / /
* | | | | | | am 35cafdfc: am 141e3503: am a8c89ee3: Merge "Reject zip files that have trai...Narayan Kamath2014-06-062-12/+38
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 141e3503: am a8c89ee3: Merge "Reject zip files that have trailing bytes af...Narayan Kamath2014-06-062-12/+38
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am a8c89ee3: Merge "Reject zip files that have trailing bytes after their CD."Narayan Kamath2014-06-062-12/+38
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Reject zip files that have trailing bytes after their CD."Narayan Kamath2014-06-062-12/+38
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Reject zip files that have trailing bytes after their CD.Narayan Kamath2014-06-052-12/+38
* | | | | | | am 928821bd: am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-...Ian Rogers2014-06-053-0/+4
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bi...Ian Rogers2014-06-053-0/+4
| |\ \ \ \ \ \ | | |/ / / / /