Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | resolved conflicts for merge of 41b797de to master | Kenny Root | 2014-06-11 | 2 | -70/+68 | |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | am c720a12a: am e2d5a3b4: Merge "Switch md5 over to openssl rather than libc." | Elliott Hughes | 2014-06-09 | 2 | -68/+66 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | am e2d5a3b4: Merge "Switch md5 over to openssl rather than libc." | Elliott Hughes | 2014-06-09 | 2 | -68/+66 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | * | | | Merge "Switch md5 over to openssl rather than libc." | Elliott Hughes | 2014-06-09 | 2 | -68/+66 | |
| | | |\ \ \ | | | | |_|/ | | | |/| | | ||||||
| | | | * | | Switch md5 over to openssl rather than libc. | Elliott Hughes | 2014-06-09 | 2 | -68/+66 | |
* | | | | | | am 6d7649b6: Merge "Add missing headers" into lmp-preview-dev | Brian Carlstrom | 2014-06-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge "Add missing headers" into lmp-preview-dev | Brian Carlstrom | 2014-06-10 | 2 | -0/+2 | |
| |\ \ \ \ \ \ | ||||||
| | * | | | | | | Add missing headers | Dan Albert | 2014-06-09 | 2 | -0/+2 | |
* | | | | | | | | am 8c170ef7: Merge "Remove libstdc++ dependency from host libbacktrace" into ... | Brian Carlstrom | 2014-06-11 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Merge "Remove libstdc++ dependency from host libbacktrace" into lmp-preview-dev | Brian Carlstrom | 2014-06-10 | 1 | -0/+3 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Remove libstdc++ dependency from host libbacktrace | Dan Albert | 2014-06-09 | 1 | -0/+3 | |
* | | | | | | | | am 72299bf0: [Bug]NE when playing mp3 with incorrect UTF16 char | Cylen Yao | 2014-06-11 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | [Bug]NE when playing mp3 with incorrect UTF16 char | Cylen Yao | 2014-06-10 | 1 | -1/+2 | |
| |/ / / / / / | ||||||
* | | | | | | | Add gtest conformance tests for libsync. Not complete yet, but substantially ... | Riley Andrews | 2014-06-10 | 2 | -0/+646 | |
| |_|_|_|_|/ |/| | | | | | ||||||
* | | | | | | Uniformly escape shell arguments. | Jeff Sharkey | 2014-06-10 | 1 | -40/+25 | |
* | | | | | | am c24b98c7: (-s ours) Add a couple of useful string functions. (DO NOT MERGE) | Jeff Brown | 2014-06-10 | 0 | -0/+0 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Add a couple of useful string functions. (DO NOT MERGE) | Jeff Brown | 2014-06-09 | 2 | -0/+37 | |
* | | | | | | Merge "Add a couple of useful string functions." | Jeff Brown | 2014-06-09 | 2 | -0/+37 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Add a couple of useful string functions. | Jeff Brown | 2014-06-09 | 2 | -0/+37 | |
* | | | | | | | am 08511d6e: Make host ashmem_create_region seed only once. | Mathieu Chartier | 2014-06-09 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Make host ashmem_create_region seed only once. | Mathieu Chartier | 2014-06-06 | 2 | -71/+73 | |
* | | | | | | | am f3af14e6: am ef47eb19: am 30136150: Merge "adb: avoid leaking file descrip... | Nick Kralevich | 2014-06-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | ||||||
| * | | | | | am ef47eb19: am 30136150: Merge "adb: avoid leaking file descriptors" | Nick Kralevich | 2014-06-07 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | * | | | | am 30136150: Merge "adb: avoid leaking file descriptors" | Nick Kralevich | 2014-06-06 | 1 | -1/+1 | |
| | |\ \ \ \ | | | | |/ / | | | |/| | | ||||||
| | | * | | | Merge "adb: avoid leaking file descriptors" | Nick Kralevich | 2014-06-06 | 1 | -1/+1 | |
| | | |\ \ \ | ||||||
| | | | * | | | adb: avoid leaking file descriptors | Nick Kralevich | 2014-06-05 | 1 | -1/+1 | |
* | | | | | | | am f6d8dedd: am 8af98621: am 5db5b8aa: Merge "Port libcutils memset16/32 to x... | Christopher Ferris | 2014-06-06 | 4 | -16/+994 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 8af98621: am 5db5b8aa: Merge "Port libcutils memset16/32 to x86_64." | Christopher Ferris | 2014-06-06 | 4 | -16/+994 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | am 5db5b8aa: Merge "Port libcutils memset16/32 to x86_64." | Christopher Ferris | 2014-06-06 | 4 | -16/+994 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Merge "Port libcutils memset16/32 to x86_64." | Christopher Ferris | 2014-06-06 | 4 | -16/+994 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Port libcutils memset16/32 to x86_64. | Henrik Smiding | 2014-06-05 | 4 | -16/+994 | |
| | | | |/ / / | ||||||
* | | | | | | | am b311ca9e: Add LD_PRELOAD for libsigchain.so to the environment | Dave Allison | 2014-06-06 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | ||||||
| * | | | | | | Add LD_PRELOAD for libsigchain.so to the environment | Dave Allison | 2014-06-02 | 1 | -0/+1 | |
* | | | | | | | am 6a5b8cf5: am 02de7d7a: am ae8f67d7: Merge "logd: logcat unexpected EOF on ... | Mark Salyzyn | 2014-06-06 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | am 02de7d7a: am ae8f67d7: Merge "logd: logcat unexpected EOF on slow consoles" | Mark Salyzyn | 2014-06-06 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | * | | | | | am ae8f67d7: Merge "logd: logcat unexpected EOF on slow consoles" | Mark Salyzyn | 2014-06-06 | 1 | -0/+1 | |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | ||||||
| | | * | | | | Merge "logd: logcat unexpected EOF on slow consoles" | Mark Salyzyn | 2014-06-06 | 1 | -0/+1 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | logd: logcat unexpected EOF on slow consoles | Mark Salyzyn | 2014-06-06 | 1 | -0/+1 | |
| | | |/ / / / | ||||||
* | | | | | | | am 5ceec65d: am de3ff60d: am b7b92ae2: Merge "Fix build." | Narayan Kamath | 2014-06-06 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am de3ff60d: am b7b92ae2: Merge "Fix build." | Narayan Kamath | 2014-06-06 | 1 | -2/+2 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | am b7b92ae2: Merge "Fix build." | Narayan Kamath | 2014-06-06 | 1 | -2/+2 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Merge "Fix build." | Narayan Kamath | 2014-06-06 | 1 | -2/+2 | |
| | | |\ \ \ \ | ||||||
| | | | * | | | | Fix build. | Narayan Kamath | 2014-06-06 | 1 | -2/+2 | |
| | | |/ / / / | ||||||
* | | | | | | | am 35cafdfc: am 141e3503: am a8c89ee3: Merge "Reject zip files that have trai... | Narayan Kamath | 2014-06-06 | 2 | -12/+38 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 141e3503: am a8c89ee3: Merge "Reject zip files that have trailing bytes af... | Narayan Kamath | 2014-06-06 | 2 | -12/+38 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | am a8c89ee3: Merge "Reject zip files that have trailing bytes after their CD." | Narayan Kamath | 2014-06-06 | 2 | -12/+38 | |
| | |\ \ \ \ \ | | | |/ / / / | ||||||
| | | * | | | | Merge "Reject zip files that have trailing bytes after their CD." | Narayan Kamath | 2014-06-06 | 2 | -12/+38 | |
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | | | ||||||
| | | | * | | | Reject zip files that have trailing bytes after their CD. | Narayan Kamath | 2014-06-05 | 2 | -12/+38 | |
* | | | | | | | am 928821bd: am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-... | Ian Rogers | 2014-06-05 | 3 | -0/+4 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 72d77449: am 4ca26ce8: Merge "Host multilib build of both 32-bit and 64-bi... | Ian Rogers | 2014-06-05 | 3 | -0/+4 | |
| |\ \ \ \ \ \ | | |/ / / / / |