summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Don't build init with clang for now"android-l-preview_r2Chih-hung Hsieh2014-10-161-0/+4
|\
| * Don't build init with clang for nowBernhard Rosenkraenzer2014-10-031-0/+4
* | Merge "Do not inline rarely used trace function bodies."Chih-Hung Hsieh2014-10-152-39/+68
|\ \
| * | Do not inline rarely used trace function bodies.Chih-Hung Hsieh2014-10-142-39/+68
* | | Merge "logd: insert order for first entry"Mark Salyzyn2014-10-141-1/+2
|\ \ \ | |/ / |/| |
| * | logd: insert order for first entryMark Salyzyn2014-10-141-1/+2
|/ /
* | Merge "Remove libsigchain from LD_PRELOADs"Dmitriy Ivanov2014-10-141-1/+0
|\ \
| * | Remove libsigchain from LD_PRELOADsDmitriy Ivanov2014-10-071-1/+0
* | | Merge "Add gtest conformance tests for libsync."Riley Andrews2014-10-112-0/+646
|\ \ \
| * | | Add gtest conformance tests for libsync.Riley Andrews2014-10-102-0/+646
|/ / /
* | | Merge "fs_mgr: fix build breakage"Mark Salyzyn2014-10-091-0/+1
|\ \ \
| * | | fs_mgr: fix build breakageMark Salyzyn2014-10-081-0/+1
|/ / /
* | | Merge "Fix top for very large VSS."Elliott Hughes2014-10-081-17/+30
|\ \ \
| * | | Fix top for very large VSS.Elliott Hughes2014-10-081-17/+30
|/ / /
* | | Merge changes I7d0b85b5,I74796043Mark Salyzyn2014-10-071-1/+10
|\ \ \
| * | | logd: LogStatistics leakMark Salyzyn2014-10-061-0/+4
| * | | logd: kill(0,0) issueMark Salyzyn2014-10-061-1/+6
|/ / /
* | | Merge changes I74796043,I74796043Mark Salyzyn2014-10-066-69/+97
|\ \ \
| * | | logd: Add control statistics enable/disable.Mark Salyzyn2014-10-065-14/+42
| * | | logd: cleanupMark Salyzyn2014-10-064-56/+56
|/ / /
* | | Merge "Add -no-integrated-as at local level."Chih-Hung Hsieh2014-10-065-0/+18
|\ \ \ | |/ / |/| |
| * | Add -no-integrated-as at local level.Chih-Hung Hsieh2014-10-065-0/+18
|/ /
* | Merge "Fix a typo in ioctl usage message."Elliott Hughes2014-10-061-1/+1
|\ \
| * | Fix a typo in ioctl usage message.Elliott Hughes2014-10-061-1/+1
|/ /
* | Merge "Revert "Rewrite atomic.h to use stdatomic.h.""Hans Boehm2014-10-039-132/+1040
|\ \
| * | Revert "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-039-132/+1040
* | | Merge "Rewrite atomic.h to use stdatomic.h."Hans Boehm2014-10-039-1040/+132
|\| | | |/ |/|
| * Rewrite atomic.h to use stdatomic.h.Hans Boehm2014-10-019-1040/+132
* | Merge "Use initUnchangeableSystemProperty for initializing os.arch."Calin Juravle2014-10-021-5/+5
|\ \ | |/ |/|
| * Use initUnchangeableSystemProperty for initializing os.arch.Calin Juravle2014-10-011-5/+5
|/
* Merge "logd: in nonblocking read, sched_yield() synchronization"Mark Salyzyn2014-09-291-0/+5
|\
| * logd: in nonblocking read, sched_yield() synchronizationMark Salyzyn2014-09-291-0/+5
|/
* Merge "Fix mac build for nativebridge tests."Andreas Gampe2014-09-291-2/+2
|\
| * Fix mac build for nativebridge tests.Calin Juravle2014-09-291-2/+2
|/
* Merge "logd: auditd: report facility LOG_AUTH"Mark Salyzyn2014-09-281-4/+15
|\
| * logd: auditd: report facility LOG_AUTHMark Salyzyn2014-09-281-4/+15
|/
* Merge "Switch from using base64 BIOs to encoding funcs."Alex Klyubin2014-09-261-19/+47
|\
| * Switch from using base64 BIOs to encoding funcs.Adam Langley2014-09-051-19/+47
* | Merge "LibNativeBridge: Add testing"Andreas Gampe2014-09-264-4/+129
|\ \
| * | LibNativeBridge: Add testingAndreas Gampe2014-09-264-4/+129
* | | Merge "Don't manually link stlport."Dan Albert2014-09-261-1/+1
|\ \ \ | |/ / |/| |
| * | Don't manually link stlport.Dan Albert2014-09-261-1/+1
|/ /
* | Merge "LibNativeBridge: Fix two bugs"Andreas Gampe2014-09-251-3/+8
|\ \
| * | LibNativeBridge: Fix two bugsAndreas Gampe2014-09-251-3/+8
|/ /
* | Merge "Revert "Switch adb to epoll(2).""Dan Albert2014-09-251-4/+21
|\ \
| * | Revert "Switch adb to epoll(2)."Dan Albert2014-09-251-4/+21
|/ /
* | Merge "LibNativeBridge: Fix mac build warning"Ian Rogers2014-09-241-0/+5
|\ \
| * | LibNativeBridge: Fix mac build warningAndreas Gampe2014-09-241-0/+5
|/ /
* | Merge "LibNativeHelper: No bind mount on mac"Andreas Gampe2014-09-241-0/+4
|\ \
| * | LibNativeHelper: No bind mount on macAndreas Gampe2014-09-241-0/+4
|/ /