summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 3ca99f6c: Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
|\
| * Merge "fix vulnerability in bspatch"Doug Zongker2014-05-161-0/+5
| |\
| | * fix vulnerability in bspatchDoug Zongker2014-05-131-0/+5
* | | am d27aa76a: Merge "Support BGRA framebuffer"Doug Zongker2014-05-131-0/+13
|\ \ \ | |/ /
| * | Merge "Support BGRA framebuffer"Doug Zongker2014-05-131-0/+13
| |\ \
| | * | Support BGRA framebufferDaniel Leung2014-05-131-0/+13
| |/ /
* | | am 74b90b30: Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
|\ \ \ | |/ /
| * | Merge "screen_ui: Initialize text buffer"Doug Zongker2014-05-131-0/+2
| |\ \ | | |/ | |/|
| | * screen_ui: Initialize text bufferBjorn Andersson2013-09-301-0/+2
* | | am 1c2cf1db: Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-025-5/+267
|\ \ \ | |/ /
| * | Merge "recovery: minui: add adf backend"Greg Hackmann2014-05-025-5/+267
| |\ \
| | * | recovery: minui: add adf backendGreg Hackmann2014-04-255-5/+267
| |/ /
* | | Merge commit '25c2b2f670a3b11f7ce78eccde10c1a79188c9a8' into HEADBill Yi2014-04-299-29/+180
|\ \ \ | |/ / |/| |
| * | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
| |\ \
| * \ \ resolved conflicts for merge of 708aa238 to klp-dev-plus-aospDoug Zongker2014-03-181-4/+10
| |\ \ \
| * \ \ \ am 130a7985: Merge "fix error log statement"Doug Zongker2014-03-171-1/+1
| |\ \ \ \
| * \ \ \ \ resolved conflicts for merge of d90da130 to klp-dev-plus-aospDoug Zongker2014-03-176-244/+253
| |\ \ \ \ \
| * \ \ \ \ \ am 026ebe02: Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am a7266ef0: Merge "separate fbdev-specific code out from minui"Doug Zongker2014-03-135-152/+268
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am c91612d4: Merge "remove pixelflinger from recovery"Doug Zongker2014-03-136-274/+358
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 8f087d02: Merge "update tools for making recovery images"Doug Zongker2014-03-132-102/+53
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am 59508993: Merge "allow CheckKey to request mounting /system"Doug Zongker2014-03-133-3/+52
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'ea868b38' into manualmergeDoug Zongker2014-03-1318-103/+204
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 2f173bde: Merge "ADB sideload command not work"Doug Zongker2014-03-113-11/+358
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am ac189bf6: Merge "recovery: Fix adb with linux 3.10"Benoit Goby2014-03-071-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on"Colin Cross2014-03-073-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f3532072: Merge "minadbd: remove dead code"Colin Cross2014-01-272-25/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 295e74aa: Merge "adbd: switch to su domain when running as root"Nick Kralevich2014-01-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery"Doug Zongker2014-01-141-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am fc729512: Merge "Set SELinux security contexts correctly for init and serv...Nick Kralevich2014-01-131-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 617d1cad: Merge "minui: do not use flexible array initialization"Nick Kralevich2014-01-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into k...Michael Runge2013-12-261-5/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Don't abort on read_file if the file is missing." into klp-devMichael Runge2013-12-201-5/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Don't abort on read_file if the file is missing.Michael Runge2013-12-131-5/+3
| * | | | | | | | | | | | | | | | | | | | | | am 168724c3: fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-191-15/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | fix unnecessarily slow writing of EMMC partitionsDoug Zongker2013-12-191-15/+3
| | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am c87bab10: add the functions for multi-stage packages to updaterDoug Zongker2013-11-278-9/+181
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | add the functions for multi-stage packages to updaterDoug Zongker2013-11-268-9/+181
* | | | | | | | | | | | | | | | | | | | | | Merge "Change filesystem add entry API call."Sasha Levitskiy2014-04-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Change filesystem add entry API call.Sasha Levitskiy2014-04-111-1/+1
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge "restore minui support for paletted images with < 8 bits"Doug Zongker2014-03-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | restore minui support for paletted images with < 8 bitsDoug Zongker2014-03-201-1/+1
|/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "add --shutdown_after option to recovery"Doug Zongker2014-03-181-4/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | add --shutdown_after option to recoveryDoug Zongker2014-03-181-4/+10
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "fix error log statement"Doug Zongker2014-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | fix error log statementDoug Zongker2014-03-171-1/+1
|/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge "refactor image resource loading code in minui"Doug Zongker2014-03-176-244/+253
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | refactor image resource loading code in minuiDoug Zongker2014-03-176-244/+253
|/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | Merge "Recovery 64-bit compile issues"Mark Salyzyn2014-03-1411-30/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Recovery 64-bit compile issuesMark Salyzyn2014-03-1411-30/+33
|/ / / / / / / / / / / / / / / /