summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* mkbootimg: add os_versionSami Tolvanen2016-03-152-4/+43
* Merge "[core][trusty] Implement Trusty NVRAM HAL module."Mattias Nissler2016-03-153-0/+221
|\
| * [core][trusty] Implement Trusty NVRAM HAL module.Mattias Nissler2016-03-113-0/+221
* | Merge "bootstat: Disambiguate boot time on encrypted devices."James Hawkins2016-03-147-31/+127
|\ \
| * | bootstat: Disambiguate boot time on encrypted devices.James Hawkins2016-03-117-31/+127
* | | Merge "init-debug.rc: mount debugfs"Elliott Hughes2016-03-141-0/+3
|\ \ \
| * | | init-debug.rc: mount debugfsMihai Serban2016-03-071-0/+3
* | | | Merge "liblog: truncate logtags that overflow prefixBuf"Mark Salyzyn2016-03-142-2/+64
|\ \ \ \
| * | | | liblog: truncate logtags that overflow prefixBufMark Salyzyn2016-03-142-2/+64
|/ / / /
* | | | Merge "Leftovers of the SELinux policy update mechanism"Janis Danisevskis2016-03-134-31/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Leftovers of the SELinux policy update mechanismJanis Danisevskis2016-03-114-31/+1
* | | | Merge "Fix buffer overrun in adb wait-for-device."Elliott Hughes2016-03-111-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Fix buffer overrun in adb wait-for-device.Elliott Hughes2016-03-101-2/+2
* | | | Merge "emulator: Use distinct serial names for simultaneous qemu pipes."Prathmesh Prabhu2016-03-111-1/+2
|\ \ \ \
| * | | | emulator: Use distinct serial names for simultaneous qemu pipes.Prathmesh Prabhu2016-03-101-1/+2
| |/ / /
* | | | Merge "Revert "mkbootimg: add version and patch level""Sami Tolvanen2016-03-112-26/+4
|\ \ \ \
| * | | | Revert "mkbootimg: add version and patch level"Sami Tolvanen2016-03-112-26/+4
* | | | | Merge "liblog: audit declare LIBLOG_ABI_PUBLIC"Mark Salyzyn2016-03-1013-151/+257
|\ \ \ \ \
| * | | | | liblog: audit declare LIBLOG_ABI_PUBLICMark Salyzyn2016-03-1013-151/+257
| | |/ / / | |/| | |
* | | | | Merge "Add error reporting mechanism for failing Unwind."Christopher Ferris2016-03-108-3/+111
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add error reporting mechanism for failing Unwind.Christopher Ferris2016-03-108-3/+111
* | | | | Merge "debuggerd: make sure that we kill the process after dumping."Josh Gao2016-03-101-61/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | debuggerd: make sure that we kill the process after dumping.Josh Gao2016-03-091-61/+85
* | | | | Merge "bootstat: Add more debug logging metrics to RecordFactoryReset."James Hawkins2016-03-091-0/+11
|\ \ \ \ \
| * | | | | bootstat: Add more debug logging metrics to RecordFactoryReset.James Hawkins2016-03-081-0/+11
* | | | | | Merge "bootstat: Add more strings to the bootreason mapping."James Hawkins2016-03-091-0/+24
|\ \ \ \ \ \
| * | | | | | bootstat: Add more strings to the bootreason mapping.James Hawkins2016-03-081-0/+24
| |/ / / / /
* | | | | | Merge "Add Mips64 Runtime ISA type."Calin Juravle2016-03-092-4/+8
|\ \ \ \ \ \
| * | | | | | Add Mips64 Runtime ISA type.Douglas Leung2016-02-082-4/+8
* | | | | | | Merge "healthd: Check if battery device exists instead of charger drivers bef...Ruchi Kandoi2016-03-091-7/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | healthd: Check if battery device exists instead of charger drivers beforeRuchi Kandoi2016-03-081-7/+3
* | | | | | | Merge changes I7aca7c7c,If9582ae6Michael Ryleev2016-03-081-1/+173
|\ \ \ \ \ \ \
| * | | | | | | trusty: tipc_test: fix for building with -Wformat-security flagMichael Ryleev2016-02-191-1/+1
| * | | | | | | trusty: tipc_test: add tests for readv/writev APIsMichael Ryleev2016-02-191-0/+172
* | | | | | | | Merge changes Ie9594b6e,I2e050a37,Ia2bf2ccf,I4e4db704,Ifbfd14e2, ...Colin Cross2016-03-0819-167/+1255
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix mac buildColin Cross2016-03-081-0/+1
| * | | | | | | | Add ABI to leak reportColin Cross2016-03-071-0/+19
| * | | | | | | | Combine leaks with same stacktraceColin Cross2016-03-077-50/+176
| * | | | | | | | Fix allocator::map template argument orderingColin Cross2016-03-074-4/+4
| * | | | | | | | Fold leaks that are referenced by other leaksColin Cross2016-03-0710-41/+923
| * | | | | | | | Compile some tests for the hostColin Cross2016-03-078-105/+165
* | | | | | | | | Merge "Don\'t fail if the new pss is less than stable."Christopher Ferris2016-03-081-3/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Merge "Don't fail if the new pss is less than stable."Christopher Ferris2016-03-081-3/+3
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Don't fail if the new pss is less than stable.Christopher Ferris2016-03-071-3/+3
* | | | | | | | | | Merge "mkbootimg: add version and patch level"Sami Tolvanen2016-03-082-4/+26
|\| | | | | | | | |
| * | | | | | | | | Merge "mkbootimg: add version and patch level"Sami Tolvanen2016-03-082-4/+26
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | mkbootimg: add version and patch levelSami Tolvanen2016-03-072-4/+26
* | | | | | | | | | Merge "Cleanup uses of sprintf so we can deprecate it."George Burgess IV2016-03-089-30/+35
|\| | | | | | | | |
| * | | | | | | | | Merge "Cleanup uses of sprintf so we can deprecate it."George Burgess IV2016-03-089-30/+35
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Cleanup uses of sprintf so we can deprecate it.George Burgess IV2016-03-079-30/+35
| | | |/ / / / / / | | |/| | | | | |