summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 78aa50d3: Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
|\
| * Merge "recovery: Handle EV_SW events"Elliott Hughes2015-02-111-2/+2
| |\
| | * recovery: Handle EV_SW eventsAjay Dudani2015-02-101-2/+2
| |/
* | am bf0be350: Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
|\ \ | |/
| * Merge "recovery: Generate libminui dynamic library"Elliott Hughes2015-02-111-0/+7
| |\
| | * recovery: Generate libminui dynamic libraryAjay Dudani2015-02-101-0/+7
| |/
* | resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aospElliott Hughes2015-02-103-6/+10
|\ \ | |/
| * Merge "recovery: Properly detect userdebug or eng builds"Elliott Hughes2015-02-103-6/+10
| |\
| | * recovery: Properly detect userdebug or eng buildsElliott Hughes2015-02-103-6/+10
| |/
* | am 99e084ca: Merge "Remove dead/unused code and realign some of the comments ...Nick Kralevich2015-02-083-23/+8
|\ \ | |/
| * Merge "Remove dead/unused code and realign some of the comments to make it mo...Nick Kralevich2015-02-083-23/+8
| |\
| | * Remove dead/unused code and realign some of the commentsNanik Tolaram2015-02-083-23/+8
| |/
* | am 6a0d2fbc: Merge "There\'s no GPL code in \'updater\'."Elliott Hughes2015-02-072-339/+0
|\ \ | |/
| * Merge "There's no GPL code in 'updater'."Elliott Hughes2015-02-072-339/+0
| |\
| | * There's no GPL code in 'updater'.Elliott Hughes2015-02-052-339/+0
| |/
* | am aeecac54: Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
|\ \ | |/
| * Merge "Add missing includes."Elliott Hughes2015-01-3011-0/+12
| |\
| | * Add missing includes.Elliott Hughes2015-01-2911-0/+12
| |/
* | am dab56cac: Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
|\ \ | |/
| * Merge "Add missing includes."Elliott Hughes2015-01-284-2/+6
| |\
| | * Add missing includes.Elliott Hughes2015-01-284-2/+6
| |/
* | am eaeb55f7: Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
|\ \ | |/
| * Merge "Start losing code to libadb."Dan Albert2015-01-273-698/+1
| |\
| | * Start losing code to libadb.Dan Albert2014-11-253-698/+1
* | | am cdc38d04: Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
|\ \ \ | |/ /
| * | Merge "Fix the v2 descriptor handling."Christopher Ferris2015-01-261-11/+6
| |\ \
| | * | Fix the v2 descriptor handling.Christopher Ferris2015-01-261-11/+6
* | | | am cad5ce81: Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
|\ \ \ \ | |/ / /
| * | | Merge "adbd: Support for new f_fs descriptor format"Christopher Ferris2015-01-261-54/+107
| |\ \ \ | | |/ /
| | * | adbd: Support for new f_fs descriptor formatBadhri Jagan Sridharan2015-01-261-54/+107
* | | | am d4069928: Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "Add missing <string.h> include."Elliott Hughes2015-01-251-0/+1
| |\ \ \ | | |/ / | |/| |
| | * | Add missing <string.h> include.Elliott Hughes2015-01-241-0/+1
* | | | am eade3a80: Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
|\ \ \ \ | |/ / /
| * | | Merge "Remove superfluous OpenSSL include paths."Kenny Root2015-01-231-1/+0
| |\ \ \ | | |/ / | |/| |
| | * | Remove superfluous OpenSSL include paths.Adam Langley2015-01-221-1/+0
| |/ /
* | | am 5bf74b23: Bump up max_map_count value.Jesse Zhao2015-01-151-0/+1
|\ \ \
| * | | Bump up max_map_count value.Jesse Zhao2015-01-081-0/+1
* | | | am dd719dfe: Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Use getmntent when accessing /proc/mounts."Yabin Cui2015-01-061-75/+14
| |\ \ \
| | * | | Use getmntent when accessing /proc/mounts.Yabin Cui2015-01-021-75/+14
* | | | | am a5d63956: Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Remove an uninitialized value."Dan Albert2015-01-051-2/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Remove an uninitialized value.Dan Albert2014-12-181-2/+1
* | | | | am 538d7d83: Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-302-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix missing #includes in bootable/recovery."Elliott Hughes2014-12-292-2/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix missing #includes in bootable/recovery.Elliott Hughes2014-12-292-2/+4
| |/ / /
* | | | am a72512cd: Add O_CREAT option for openSungmin Choi2014-12-111-2/+10
|\ \ \ \ | | |/ / | |/| |
| * | | Add O_CREAT option for openSungmin Choi2014-12-101-2/+10
* | | | am f59b9942: Add basic navigation controls to log viewer.Patrick Tjin2014-12-101-2/+36
|\ \ \ \ | |/ / /