summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Move canned_fs_config into libcutils"android-wear-n-preview-1android-n-preview-3Treehugger Robot2016-05-133-0/+144
|\
| * Move canned_fs_config into libcutilsMohamad Ayyash2016-05-123-0/+144
* | Merge "adb: support forwarding TCP port 0."David Pursell2016-05-1315-172/+440
|\ \ | |/ |/|
| * adb: support forwarding TCP port 0.David Pursell2016-05-0915-172/+440
* | Merge "init.rc: Remove cpu weight set on the root cgroup"Treehugger Robot2016-05-121-1/+0
|\ \
| * | init.rc: Remove cpu weight set on the root cgroupIrina Patru2016-05-121-1/+0
* | | Merge "liblog: sleep 20ms before critical property_set"Treehugger Robot2016-05-121-0/+10
|\ \ \ | |/ / |/| |
| * | liblog: sleep 20ms before critical property_setMark Salyzyn2016-05-121-0/+10
|/ /
* | Merge "Report errno more often in fastboot."Elliott Hughes2016-05-111-21/+17
|\ \
| * | Report errno more often in fastboot.Elliott Hughes2016-05-111-21/+17
* | | Merge "Move linker-namespace functions declarations"Dimitry Ivanov2016-05-112-1/+91
|\ \ \
| * | | Move linker-namespace functions declarationsDimitry Ivanov2016-05-092-1/+91
* | | | Merge "Add a fortify test to crasher."Elliott Hughes2016-05-112-6/+12
|\ \ \ \
| * | | | Add a fortify test to crasher.Elliott Hughes2016-05-102-6/+12
| | |/ / | |/| |
* | | | Merge "nativeloader: Ignore empty java_permitted_path"Dimitry Ivanov2016-05-111-1/+3
|\ \ \ \
| * | | | nativeloader: Ignore empty java_permitted_pathDimitry Ivanov2016-05-111-1/+3
|/ / / /
* | | | Merge "Check if public namespace has already been initialized"Dimitry Ivanov2016-05-101-0/+7
|\ \ \ \
| * | | | Check if public namespace has already been initializedDimitry Ivanov2016-05-091-0/+7
| | |/ / | |/| |
* | | | Merge "Extend white-listed directories to include /mnt/expand"Treehugger Robot2016-05-101-2/+14
|\ \ \ \ | |_|/ / |/| | |
| * | | Extend white-listed directories to include /mnt/expandDimitry Ivanov2016-05-101-2/+14
|/ / /
* | | Merge "<cutils/atomic.h> has been inlined for two years now."Elliott Hughes2016-05-102-27/+0
|\ \ \ | |/ / |/| |
| * | <cutils/atomic.h> has been inlined for two years now.Elliott Hughes2016-05-092-27/+0
* | | Merge "nativeloader: Fix the case of search_path == null"Dimitry Ivanov2016-05-091-1/+6
|\ \ \ | |_|/ |/| |
| * | nativeloader: Fix the case of search_path == nullDimitry Ivanov2016-05-091-1/+6
|/ /
* | Merge "Return correct length from pmsgRead()"Treehugger Robot2016-05-091-1/+1
|\ \ | |/ |/|
| * Return correct length from pmsgRead()Rubin Xu2016-05-051-1/+1
* | Merge "Add public libs from an environment variable"Dimitry Ivanov2016-05-062-7/+28
|\ \
| * | Add public libs from an environment variableDimitry Ivanov2016-05-062-7/+28
* | | Merge "enable integer sanitizer for sdcard service"Nick Kralevich2016-05-061-0/+3
|\ \ \
| * | | enable integer sanitizer for sdcard serviceDaniel Micay2016-05-051-0/+3
* | | | Merge "Set groups before dropping privileges."Treehugger Robot2016-05-051-2/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | Set groups before dropping privileges.Christopher Ferris2016-05-051-2/+10
|/ / /
* | | Merge "Fix null pointer dereference."Treehugger Robot2016-05-051-3/+3
|\ \ \
| * | | Fix null pointer dereference.Christopher Ferris2016-05-051-3/+3
|/ / /
* | | Merge "Fix problem with wait_for_gdb."Treehugger Robot2016-05-059-53/+115
|\ \ \ | |_|/ |/| |
| * | Fix problem with wait_for_gdb.Christopher Ferris2016-05-059-53/+115
|/ /
* | Merge "Lose ps to toybox."Elliott Hughes2016-05-042-341/+0
|\ \
| * | Lose ps to toybox.Elliott Hughes2016-05-042-341/+0
* | | Merge "nativeloader: Add CloseNativeLibrary() method"Treehugger Robot2016-05-042-0/+7
|\ \ \ | |/ / |/| |
| * | nativeloader: Add CloseNativeLibrary() methodDimitry Ivanov2016-05-042-0/+7
* | | Merge "Remove <utils/ashmem.h>."Elliott Hughes2016-05-041-41/+0
|\ \ \ | |_|/ |/| |
| * | Remove <utils/ashmem.h>.Elliott Hughes2016-05-041-41/+0
|/ /
* | Merge changes I80cdf61e,I9885cc8d,I47c2095a,Id240b1b3,I3e468c10Michael Ryleev2016-05-0331-0/+4330
|\ \
| * | trusty: storage: implement storage proxy daemonMichael Ryleev2016-05-0210-0/+1285
| * | trusty: storage: add trusty interface headerAndres Morales2016-05-022-0/+310
| * | trusty: add trusty-base.mkMichael Ryleev2016-05-021-0/+28
| * | trusty: add keymaster moduleAndres Morales2016-05-0210-0/+2091
| * | trusty: add gatekeeper moduleAndres Morales2016-05-028-0/+616
|/ /
* | Merge "nativeloader: Add Reset capabilities"Dimitry Ivanov2016-05-022-0/+13
|\ \ | |/ |/|
| * nativeloader: Add Reset capabilitiesDimitry Ivanov2016-05-022-0/+13
|/