Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | am 29759e9d: Merge commit \'25c2b2f670a3b11f7ce78eccde10c1a79188c9a8\' into HEAD | Bill Yi | 2014-04-30 | 1 | -1/+0 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | 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 9e8d81ba: am 0e22af65: recovery: Fix adb with linux 3.10 | Benoit Goby | 2014-04-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am 0e22af65: recovery: Fix adb with linux 3.10 | Benoit Goby | 2014-04-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | recovery: Fix adb with linux 3.10 | Benoit Goby | 2014-04-18 | 1 | -0/+6 | |
* | | | | | | | | | | | | | | | | | | | | am ecf1f6c9: am 558f2700: Merge "Change filesystem add entry API call." | Sasha Levitskiy | 2014-04-12 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 558f2700: Merge "Change filesystem add entry API call." | Sasha Levitskiy | 2014-04-12 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | 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 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | make density-specific recovery assets | Doug Zongker | 2014-04-04 | 58 | -16/+16 | |
* | | | | | | | | | | | | | | | | | | | add reboot-to-bootloader and power down options to recovery menu | Doug Zongker | 2014-04-01 | 3 | -18/+44 | |
* | | | | | | | | | | | | | | | | | | | remove DefaultDevice's UI subclass | Doug Zongker | 2014-04-01 | 2 | -12/+3 | |
* | | | | | | | | | | | | | | | | | | | Merge "Fix build break caused by vold change" | Paul Lawrence | 2014-03-21 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Fix build break caused by vold change | Paul Lawrence | 2014-03-03 | 1 | -0/+1 | |
* | | | | | | | | | | | | | | | | | | | | am 03008bc1: am aa4545b5: Merge "restore minui support for paletted images wi... | Doug Zongker | 2014-03-20 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | am aa4545b5: Merge "restore minui support for paletted images with < 8 bits" | Doug Zongker | 2014-03-20 | 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 | |
| | |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | recovery: 64 bit build issues | Mark Salyzyn | 2014-03-19 | 1 | -3/+3 | |
* | | | | | | | | | | | | | | | | | | | am 03002477: am bacf9b45: add --shutdown_after option to recovery | Doug Zongker | 2014-03-18 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am bacf9b45: add --shutdown_after option to recovery | Doug Zongker | 2014-03-18 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | add --shutdown_after option to recovery | Doug Zongker | 2014-03-18 | 1 | -4/+10 | |
| | | |_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | am b4bbf887: resolved conflicts for merge of 708aa238 to klp-modular-dev-plus... | Doug Zongker | 2014-03-18 | 1 | -4/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | resolved conflicts for merge of 708aa238 to klp-modular-dev-plus-aosp | Doug Zongker | 2014-03-18 | 1 | -4/+10 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | 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 | |
| | |/ / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | am 47c7e365: am 130a7985: Merge "fix error log statement" | Doug Zongker | 2014-03-18 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | am 130a7985: Merge "fix error log statement" | Doug Zongker | 2014-03-17 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | 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 | |
| | |/ / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | am 80c1a386: resolved conflicts for merge of d90da130 to klp-modular-dev-plus... | Doug Zongker | 2014-03-17 | 6 | -244/+253 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | resolved conflicts for merge of d90da130 to klp-modular-dev-plus-aosp | Doug Zongker | 2014-03-17 | 6 | -244/+253 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | 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 | |
| | |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | minzip: 64 bit build issue | Mark Salyzyn | 2014-03-17 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | am 4b6de1ba: am 026ebe02: Merge "Recovery 64-bit compile issues" | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | am 026ebe02: Merge "Recovery 64-bit compile issues" | Mark Salyzyn | 2014-03-14 | 11 | -30/+33 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / |