summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 3b5214a6 to masterBrian Swetland2010-09-193-11/+25
|\
| * am 02863b95: add /vendor supportBrian Swetland2010-09-193-11/+26
| |\
| | * add /vendor supportBrian Swetland2010-09-193-11/+26
* | | am 06b21887: am 2da0032c: add graphics events to the eventlog definitionsMathias Agopian2010-09-151-0/+18
|\ \ \ | |/ /
| * | am 2da0032c: add graphics events to the eventlog definitionsMathias Agopian2010-09-141-0/+18
| |\ \ | | |/
| | * add graphics events to the eventlog definitionsMathias Agopian2010-09-141-0/+18
* | | am 1db75e7b: am 6fd75635: Merge "Fetch peer credentials for local sockets" in...Kenny Root2010-09-152-2/+31
|\ \ \ | |/ /
| * | am 6fd75635: Merge "Fetch peer credentials for local sockets" into gingerbreadKenny Root2010-09-142-2/+31
| |\ \ | | |/
| | * Merge "Fetch peer credentials for local sockets" into gingerbreadKenny Root2010-09-142-2/+31
| | |\
| | | * Fetch peer credentials for local socketsKenny Root2010-09-142-2/+31
* | | | am 2c42e440: am 9915e3fd: Add dvm_lock_sample\'s new fields.Brad Fitzpatrick2010-09-151-1/+1
|\ \ \ \ | |/ / /
| * | | am 9915e3fd: Add dvm_lock_sample\'s new fields.Brad Fitzpatrick2010-09-141-1/+1
| |\ \ \ | | |/ /
| | * | Add dvm_lock_sample's new fields.Brad Fitzpatrick2010-09-141-1/+1
| | |/
* | | am 0e6242f7: am 40c2b7cb: Merge "Add missing lock in SocketListener." into gi...Brad Fitzpatrick2010-09-151-0/+1
|\ \ \ | |/ /
| * | am 40c2b7cb: Merge "Add missing lock in SocketListener." into gingerbreadBrad Fitzpatrick2010-09-141-0/+1
| |\ \ | | |/
| | * Merge "Add missing lock in SocketListener." into gingerbreadBrad Fitzpatrick2010-09-141-0/+1
| | |\
| | | * Add missing lock in SocketListener.Brad Fitzpatrick2010-09-141-0/+1
* | | | am c3fa6149: am f31d2ed1: Return false on socket read errorKenny Root2010-09-151-1/+1
|\ \ \ \ | |/ / /
| * | | am f31d2ed1: Return false on socket read errorKenny Root2010-09-141-1/+1
| |\ \ \ | | |/ /
| | * | Return false on socket read errorKenny Root2010-09-141-1/+1
| | |/
* | | am 5833769d: am 09dd3e57: make df more readableBrian Swetland2010-09-111-8/+24
|\ \ \ | |/ /
| * | am 09dd3e57: make df more readableBrian Swetland2010-09-111-8/+24
| |\ \ | | |/
| | * make df more readableBrian Swetland2010-09-111-8/+24
* | | am 1d10577e: manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-103-6/+5
|\ \ \ | |/ /
| * | manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-103-6/+5
| |\ \
| | * | Don't alias 'stop' to 'kill -STOP'Jeff Hamilton2010-09-103-6/+5
* | | | am 26ce6e0e: manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-102-0/+16
|\ \ \ \ | |/ / /
| * | | manual merge from readonly-korg-masterJean-Baptiste Queru2010-09-102-0/+16
| |\ \ \ | | |/ /
| | * | Merge "- Add drm and drmio service - Add /data/drm directory for storing DRM ...Jean-Baptiste Queru2010-09-092-0/+16
| | |\ \
| | | * | - Add drm and drmio serviceaimitakeshi2010-07-272-0/+16
* | | | | am 8df3a4a5: am 4012c0a4: Merge "remount / as read-only only on post-fs to al...Brian Swetland2010-09-081-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | am 4012c0a4: Merge "remount / as read-only only on post-fs to allow per-targe...Brian Swetland2010-09-081-2/+3
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge "remount / as read-only only on post-fs to allow per-target config of /...Brian Swetland2010-09-081-2/+3
| | |\ \ \
| | | * | | remount / as read-only only on post-fs to allow per-target config of /Brian Swetland2010-09-081-2/+3
* | | | | | am 1f43492e: am deb9188f: It seems that Windows actually does have a header f...Dan Bornstein2010-09-070-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am deb9188f: It seems that Windows actually does have a header for <stdbool.h>.Dan Bornstein2010-09-070-0/+0
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | It seems that Windows actually does have a header for <stdbool.h>.Dan Bornstein2010-09-011-1/+1
* | | | | | am 49b8124a: am 17dcc5c5: Use makedev helper for device major and minor numbersColin Cross2010-09-031-4/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 17dcc5c5: Use makedev helper for device major and minor numbersColin Cross2010-09-031-4/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Use makedev helper for device major and minor numbersColin Cross2010-09-031-4/+1
* | | | | | Merge "Remove ACC which has been replaced with llvm. Free up space in build."Jason Sams2010-09-0358-11423/+0
|\ \ \ \ \ \
| * | | | | | Remove ACC which has been replaced with llvm.Jason Sams2010-09-0158-11423/+0
* | | | | | | am 556f09c4: am f74af26d: It seems that Windows actually does have a header f...Dan Bornstein2010-09-011-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am f74af26d: It seems that Windows actually does have a header for <stdbool.h>.Dan Bornstein2010-09-011-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | It seems that Windows actually does have a header for <stdbool.h>.Dan Bornstein2010-09-011-1/+1
* | | | | | | am 095a6a6e: am 739cd9d2: Merge "get rid of compile time warning: "warning: â...Nick Kralevich2010-08-311-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | am 739cd9d2: Merge "get rid of compile time warning: "warning: ‘android_ids...Nick Kralevich2010-08-311-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "get rid of compile time warning: "warning: ‘android_ids’ defined b...Nick Kralevich2010-08-311-1/+1
| | |\ \ \ \
| | | * | | | get rid of compile time warning: "warning: ‘android_ids’ defined but not ...Nick Kralevich2010-08-311-1/+1
* | | | | | | toolbox: top: Add processor fieldDmitry Shmidt2010-08-301-6/+8