summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Revert "Fix win_sdk build."Nick Kralevich2013-02-041-6/+4
* | | | | | | | | | | Fix win_sdk build.Nick Kralevich2013-02-021-4/+6
* | | | | | | | | | | am 7480c007: am b2639f40: Merge "Label sockets consistently with the seclabel...Colin Cross2013-02-011-19/+27
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am b2639f40: Merge "Label sockets consistently with the seclabel value if spe...Colin Cross2013-02-011-19/+27
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Label sockets consistently with the seclabel value if specified."Colin Cross2013-02-011-19/+27
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | | * | | | | | | | Label sockets consistently with the seclabel value if specified.Stephen Smalley2012-11-161-19/+27
* | | | | | | | | | | Merge "property_get: do argument checking."Nick Kralevich2013-02-011-0/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | property_get: do argument checking.Nick Kralevich2013-01-311-0/+20
* | | | | | | | | | | | Merge "audio: added input device for front + back mic"Eric Laurent2013-01-311-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | audio: added input device for front + back micEric Laurent2013-01-221-0/+1
* | | | | | | | | | | | logwrapper: rename logwrap() to android_fork_execvp()Rom Lemarchand2013-01-303-40/+36
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
* | | | | | | | | | | am 282caf3b: am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h f...Kenny Root2013-01-291-0/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | am 260f3471: am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on...Kenny Root2013-01-291-0/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ am f8afaebe: Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"Kenny Root2013-01-291-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge "Windows adb: include stdint.h for uint8_t on MinGW-w64"Kenny Root2013-01-301-0/+1
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Windows adb: include stdint.h for uint8_t on MinGW-w64Ray Donnelly2013-01-081-0/+1
* | | | | | | | | | | | | am 6c3d3ccf: am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1...Kenny Root2013-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am d033739d: am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_t...Kenny Root2013-01-291-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am d40fd86e: Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"Kenny Root2013-01-291-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "Windows adb: initialize on to 1 in disable_tcp_nagle"Kenny Root2013-01-301-1/+1
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Windows adb: initialize on to 1 in disable_tcp_nagleRay Donnelly2013-01-111-1/+1
* | | | | | | | | | | | | | cutils: remove dead code.Nick Kralevich2013-01-292-39/+0
* | | | | | | | | | | | | | am 76dd8e33: resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aospDoug Zongker2013-01-290-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | resolved conflicts for merge of 016806a7 to jb-mr1-dev-plus-aospDoug Zongker2013-01-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | change AID_LOOP_RADIO uid assignmentDoug Zongker2013-01-291-1/+1
* | | | | | | | | | | | | | am 8cc97302: resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aospDoug Zongker2013-01-291-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | resolved conflicts for merge of 0fe9742e to jb-mr1-dev-plus-aospDoug Zongker2013-01-291-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | add AID_LOOP_RADIO for control of loop radio deviceDoug Zongker2013-01-291-0/+2
* | | | | | | | | | | | | am db9697b3: am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."Elliott Hughes2013-01-291-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am b94b038d: Merge "libcorkscrew will always HAVE_DLADDR."Elliott Hughes2013-01-291-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge "libcorkscrew will always HAVE_DLADDR."Elliott Hughes2013-01-291-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | libcorkscrew will always HAVE_DLADDR.Elliott Hughes2013-01-251-4/+0
| | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "Delete frameworks/base/voip use voip-common from frameworks/opt/net/voip"Wink Saville2013-01-291-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Delete frameworks/base/voip use voip-common from frameworks/opt/net/voipWink Saville2013-01-281-1/+1
* | | | | | | | | | | | | | Merge "Revert "init.usb.rc: set sys.usb.config to none before changing it""Benoit Goby2013-01-291-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Revert "init.usb.rc: set sys.usb.config to none before changing it"Benoit Goby2013-01-151-1/+0
* | | | | | | | | | | | | | | Merge "logwrap: add quiet flag to logwrap()"Rom Lemarchand2013-01-293-32/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | logwrap: add quiet flag to logwrap()Rom Lemarchand2013-01-283-32/+43
* | | | | | | | | | | | | | | | Merge "adb: Add "unauthorized" connection state"Benoit Goby2013-01-293-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| / / / / / / / / / / / / / / | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | adb: Add "unauthorized" connection stateBenoit Goby2013-01-153-0/+11
* | | | | | | | | | | | | | | Merge "logwrap: Replace sigprocmask with pthread_sigmask"Rom Lemarchand2013-01-291-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | logwrap: Replace sigprocmask with pthread_sigmaskRom Lemarchand2013-01-291-4/+4
* | | | | | | | | | | | | | | | Merge "logwrap: wait for child process when receiving SIGINT or SIGQUIT"Rom Lemarchand2013-01-293-3/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | logwrap: wait for child process when receiving SIGINT or SIGQUITRom Lemarchand2013-01-293-3/+26
* | | | | | | | | | | | | | | | logwrap: ensure child exits with _exitRom Lemarchand2013-01-281-20/+19
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge "adb: Read secure adb keys on every auth request"Benoit Goby2013-01-282-14/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | adb: Read secure adb keys on every auth requestBenoit Goby2013-01-152-14/+11
| | |_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge "logwrap: remove unnecessary call to setuid/setgid"Rom Lemarchand2013-01-281-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | logwrap: remove unnecessary call to setuid/setgidRom Lemarchand2013-01-281-6/+0
* | | | | | | | | | | | | | | Merge "logwrap: fix off by 1 argument error"Rom Lemarchand2013-01-282-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /