Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 3ca99f6c: Merge "fix vulnerability in bspatch" | Doug Zongker | 2014-05-16 | 1 | -0/+5 |
|\ | |||||
| * | Merge "fix vulnerability in bspatch" | Doug Zongker | 2014-05-16 | 1 | -0/+5 |
| |\ | |||||
| | * | fix vulnerability in bspatch | Doug Zongker | 2014-05-13 | 1 | -0/+5 |
* | | | am d27aa76a: Merge "Support BGRA framebuffer" | Doug Zongker | 2014-05-13 | 1 | -0/+13 |
|\ \ \ | |/ / | |||||
| * | | Merge "Support BGRA framebuffer" | Doug Zongker | 2014-05-13 | 1 | -0/+13 |
| |\ \ | |||||
| | * | | Support BGRA framebuffer | Daniel Leung | 2014-05-13 | 1 | -0/+13 |
| |/ / | |||||
* | | | am 74b90b30: Merge "screen_ui: Initialize text buffer" | Doug Zongker | 2014-05-13 | 1 | -0/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge "screen_ui: Initialize text buffer" | Doug Zongker | 2014-05-13 | 1 | -0/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | screen_ui: Initialize text buffer | Bjorn Andersson | 2013-09-30 | 1 | -0/+2 |
* | | | am 1c2cf1db: Merge "recovery: minui: add adf backend" | Greg Hackmann | 2014-05-02 | 5 | -5/+267 |
|\ \ \ | |/ / | |||||
| * | | Merge "recovery: minui: add adf backend" | Greg Hackmann | 2014-05-02 | 5 | -5/+267 |
| |\ \ | |||||
| | * | | recovery: minui: add adf backend | Greg Hackmann | 2014-04-25 | 5 | -5/+267 |
| |/ / | |||||
* | | | Merge commit '25c2b2f670a3b11f7ce78eccde10c1a79188c9a8' into HEAD | Bill Yi | 2014-04-29 | 9 | -29/+180 |
|\ \ \ | |/ / |/| | | |||||
| * | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits" | Doug Zongker | 2014-03-20 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | resolved conflicts for merge of 708aa238 to klp-dev-plus-aosp | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
| |\ \ \ | |||||
| * \ \ \ | am 130a7985: Merge "fix error log statement" | Doug Zongker | 2014-03-17 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | resolved conflicts for merge of d90da130 to klp-dev-plus-aosp | Doug Zongker | 2014-03-17 | 6 | -244/+253 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am 026ebe02: Merge "Recovery 64-bit compile issues" | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am a7266ef0: Merge "separate fbdev-specific code out from minui" | Doug Zongker | 2014-03-13 | 5 | -152/+268 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | am c91612d4: Merge "remove pixelflinger from recovery" | Doug Zongker | 2014-03-13 | 6 | -274/+358 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | am 8f087d02: Merge "update tools for making recovery images" | Doug Zongker | 2014-03-13 | 2 | -102/+53 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am 59508993: Merge "allow CheckKey to request mounting /system" | Doug Zongker | 2014-03-13 | 3 | -3/+52 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge commit 'ea868b38' into manualmerge | Doug Zongker | 2014-03-13 | 18 | -103/+204 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 2f173bde: Merge "ADB sideload command not work" | Doug Zongker | 2014-03-11 | 3 | -11/+358 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am ac189bf6: Merge "recovery: Fix adb with linux 3.10" | Benoit Goby | 2014-03-07 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am a5d105e2: Merge "recovery: fix building with pointer-to-int errors turned on" | Colin Cross | 2014-03-07 | 3 | -5/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f3532072: Merge "minadbd: remove dead code" | Colin Cross | 2014-01-27 | 2 | -25/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 295e74aa: Merge "adbd: switch to su domain when running as root" | Nick Kralevich | 2014-01-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 772f6e2a: Merge "correctly mount tmpfs as /tmp in recovery" | Doug Zongker | 2014-01-14 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am fc729512: Merge "Set SELinux security contexts correctly for init and serv... | Nick Kralevich | 2014-01-13 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 617d1cad: Merge "minui: do not use flexible array initialization" | Nick Kralevich | 2014-01-03 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f9dd42de: Merge "Don\'t abort on read_file if the file is missing." into k... | Michael Runge | 2013-12-26 | 1 | -5/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge "Don't abort on read_file if the file is missing." into klp-dev | Michael Runge | 2013-12-20 | 1 | -5/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | | | | Don't abort on read_file if the file is missing. | Michael Runge | 2013-12-13 | 1 | -5/+3 |
| * | | | | | | | | | | | | | | | | | | | | | | am 168724c3: fix unnecessarily slow writing of EMMC partitions | Doug Zongker | 2013-12-19 | 1 | -15/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | fix unnecessarily slow writing of EMMC partitions | Doug Zongker | 2013-12-19 | 1 | -15/+3 |
| | |/ / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | am c87bab10: add the functions for multi-stage packages to updater | Doug Zongker | 2013-11-27 | 8 | -9/+181 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | add the functions for multi-stage packages to updater | Doug Zongker | 2013-11-26 | 8 | -9/+181 |
* | | | | | | | | | | | | | | | | | | | | | | Merge "Change filesystem add entry API call." | Sasha Levitskiy | 2014-04-11 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | Change filesystem add entry API call. | Sasha Levitskiy | 2014-04-11 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | | Merge "restore minui support for paletted images with < 8 bits" | Doug Zongker | 2014-03-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | restore minui support for paletted images with < 8 bits | Doug Zongker | 2014-03-20 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | | Merge "add --shutdown_after option to recovery" | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | add --shutdown_after option to recovery | Doug Zongker | 2014-03-18 | 1 | -4/+10 |
|/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Merge "fix error log statement" | Doug Zongker | 2014-03-17 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | fix error log statement | Doug Zongker | 2014-03-17 | 1 | -1/+1 |
|/ / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | Merge "refactor image resource loading code in minui" | Doug Zongker | 2014-03-17 | 6 | -244/+253 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | refactor image resource loading code in minui | Doug Zongker | 2014-03-17 | 6 | -244/+253 |
|/ / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | Merge "Recovery 64-bit compile issues" | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Recovery 64-bit compile issues | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 |
|/ / / / / / / / / / / / / / / / |