summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fix a sporadic build breakage."Elliott Hughes2014-01-031-1/+1
|\
| * Fix a sporadic build breakage.Narayan Kamath2014-01-031-1/+1
* | Merge "Modify BYD's USB Vendor ID"Colin Cross2014-01-031-1/+1
|\ \
| * | Modify BYD's USB Vendor IDkongfanqing2013-05-151-1/+1
* | | Merge "adb: configure /system file permission with fs_config"Nick Kralevich2014-01-032-10/+65
|\ \ \
| * | | adb: configure /system file permission with fs_configLiang Cheng2014-01-022-10/+65
* | | | Merge "Change a debug log to a verbose log."Narayan Kamath2014-01-031-1/+1
|\ \ \ \
| * | | | Change a debug log to a verbose log.Narayan Kamath2014-01-021-1/+1
| | |_|/ | |/| |
* | | | Merge "toolbox-ls: re-introduce clobbered error message"Nick Kralevich2014-01-031-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | toolbox-ls: re-introduce clobbered error messageWilliam Roberts2014-01-031-0/+1
|/ / /
* | | Merge "Switch ARM back to libcorkscrew temporarily."Elliott Hughes2014-01-021-2/+5
|\ \ \
| * | | Switch ARM back to libcorkscrew temporarily.Elliott Hughes2014-01-021-2/+5
* | | | Merge "Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls."Nick Kralevich2014-01-021-0/+3
|\ \ \ \ | |_|/ / |/| | |
| * | | Apply strict SELinux checking of PROT_EXEC on mmap/mprotect calls.Stephen Smalley2013-12-231-0/+3
| |/ /
* | | Merge "ueventd: fix a busy loop while reading uevents"Colin Cross2013-12-282-2/+2
|\ \ \
| * | | ueventd: fix a busy loop while reading ueventsAmir Goldstein2013-11-172-2/+2
* | | | Merge "Run the console service shell in the shell domain."Colin Cross2013-12-271-0/+1
|\ \ \ \
| * | | | Run the console service shell in the shell domain.Stephen Smalley2013-12-231-0/+1
| | |/ / | |/| |
* | | | Merge changes Ie4b641cd,I5502b71d,I68086ce4Colin Cross2013-12-2713-1/+1526
|\ \ \ \ | |/ / / |/| | |
| * | | libion: add apache license header to ion_test.cColin Cross2013-12-191-0/+16
| * | | libion: initial unit testsColin Cross2013-12-1910-0/+1506
| * | | libion: update ion_test.hColin Cross2013-12-192-1/+4
|/ / /
* | | Merge changes I2d3fef08,Idb828aa4,Ica764b1f,I9ae8887b,I376fad86,I4d00a9ddColin Cross2013-12-198-294/+691
|\ \ \
| * | | libion: update to latest uapi headerColin Cross2013-12-185-3/+382
| * | | libion: return -errno from ion_closeColin Cross2013-12-181-1/+4
| * | | libion: add include for size_tColin Cross2013-12-181-0/+1
| * | | libion: add NULL checksColin Cross2013-12-181-3/+20
| * | | libion: clean up whitespaceColin Cross2013-12-183-294/+288
| * | | libion: move ion.h into local include directoryColin Cross2013-12-182-0/+3
* | | | Merge "ion: update struct and type definitions to match kernel header"Colin Cross2013-12-193-16/+16
|\ \ \ \ | |/ / /
| * | | ion: update struct and type definitions to match kernel headerRom Lemarchand2013-12-183-16/+16
* | | | Merge "adb: Check sender's socket id when receiving packets."Nick Kralevich2013-12-193-21/+88
|\ \ \ \
| * | | | adb: Check sender's socket id when receiving packets.David 'Digit' Turner2013-12-163-21/+88
* | | | | Merge "Make libutils Looper independent of frameworks/native"Brian Carlstrom2013-12-193-122/+211
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Make libutils Looper independent of frameworks/nativeBrian Carlstrom2013-12-183-122/+211
|/ / / /
* | | | Merge "toolbox: date: use RTC subsystem on devices without /dev/alarm"Greg Hackmann2013-12-181-14/+80
|\ \ \ \
| * | | | toolbox: date: use RTC subsystem on devices without /dev/alarmGreg Hackmann2013-12-171-14/+80
* | | | | Merge "toolbox: date: fix parameter type warnings"Greg Hackmann2013-12-181-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | toolbox: date: fix parameter type warningsGreg Hackmann2013-12-171-1/+1
* | | | | Merge "toolbox: uptime: use clock_gettime() on devices without /dev/alarm"Greg Hackmann2013-12-181-4/+14
|\ \ \ \ \ | |/ / / /
| * | | | toolbox: uptime: use clock_gettime() on devices without /dev/alarmGreg Hackmann2013-12-171-4/+14
* | | | | Merge "toolbox: uptime: fix unused parameter warnings"Greg Hackmann2013-12-181-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | toolbox: uptime: fix unused parameter warningsGreg Hackmann2013-12-171-1/+2
* | | | | Merge "SystemClock: use clock_gettime() on devices without /dev/alarm"Greg Hackmann2013-12-181-16/+9
|\ \ \ \ \ | |/ / / /
| * | | | SystemClock: use clock_gettime() on devices without /dev/alarmGreg Hackmann2013-12-171-16/+9
* | | | | Merge "rootdir: add permissions for /dev/rtc0"Greg Hackmann2013-12-181-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | rootdir: add permissions for /dev/rtc0Greg Hackmann2013-12-171-0/+1
|/ / / /
* | | | Merge "libdiskconfig: Use uintptr_t instead of uint32_t"Elliott Hughes2013-12-171-1/+1
|\ \ \ \
| * | | | libdiskconfig: Use uintptr_t instead of uint32_tAshok Bhat2013-12-171-1/+1
|/ / / /
* | | | Merge "AArch64: Correction of struct surface_t"Elliott Hughes2013-12-161-9/+11
|\ \ \ \