Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolved conflicts for merge of ec9e5891 to master | Elliott Hughes | 2014-01-16 | 29 | -63/+56 |
|\ | |||||
| * | am 8940c0a0: am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup." | Elliott Hughes | 2014-01-16 | 30 | -64/+57 |
| |\ | |||||
| | * | am 97373bbc: am 7cd15614: Merge "system/core 64-bit cleanup." | Elliott Hughes | 2014-01-16 | 30 | -64/+57 |
| | |\ | |||||
| | | * | am 7cd15614: Merge "system/core 64-bit cleanup." | Elliott Hughes | 2014-01-16 | 30 | -64/+57 |
| | | |\ | |||||
| | | | * | Merge "system/core 64-bit cleanup." | Elliott Hughes | 2014-01-16 | 30 | -64/+57 |
| | | | |\ | |||||
| | | | | * | system/core 64-bit cleanup. | Elliott Hughes | 2014-01-16 | 30 | -64/+57 |
* | | | | | | Merge "liblog: deprecate export of LOGGER_LOG_* defines" | Mark Salyzyn | 2014-01-16 | 2 | -7/+7 |
|\ \ \ \ \ \ | |||||
| * | | | | | | liblog: deprecate export of LOGGER_LOG_* defines | Mark Salyzyn | 2014-01-14 | 2 | -7/+7 |
* | | | | | | | am 325a99fb: am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase v... | Nick Kralevich | 2014-01-16 | 1 | -6/+12 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | am bdea585e: am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on... | Nick Kralevich | 2014-01-16 | 1 | -6/+12 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | am a6b65eee: am 7580661d: Merge "fs_mgr: increase verboseness on mount errors" | Nick Kralevich | 2014-01-16 | 1 | -6/+12 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | am 7580661d: Merge "fs_mgr: increase verboseness on mount errors" | Nick Kralevich | 2014-01-16 | 1 | -6/+12 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | | * | | | Merge "fs_mgr: increase verboseness on mount errors" | Nick Kralevich | 2014-01-16 | 1 | -6/+12 |
| | | | |\ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | | * | | fs_mgr: increase verboseness on mount errors | William Roberts | 2014-01-15 | 1 | -6/+12 |
* | | | | | | | Merge "fastboot: Make tags_offset a command line option." | Mohamad Ayyash | 2014-01-15 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | fastboot: Make tags_offset a command line option. | Mohamad Ayyash | 2014-01-15 | 1 | -1/+5 |
* | | | | | | | | Merge "Miscellaneous updates to <system/audio.h>" | Glenn Kasten | 2014-01-15 | 1 | -4/+36 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Miscellaneous updates to <system/audio.h> | Glenn Kasten | 2014-01-15 | 1 | -4/+36 |
* | | | | | | | | | am 11190d0c: am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/m... | Nick Kralevich | 2014-01-15 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | am 4552987e: am c93904b4: am e847f429: Merge "restorecon /data/misc/media." | Nick Kralevich | 2014-01-15 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | am c93904b4: am e847f429: Merge "restorecon /data/misc/media." | Nick Kralevich | 2014-01-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | am e847f429: Merge "restorecon /data/misc/media." | Nick Kralevich | 2014-01-15 | 1 | -0/+1 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | Merge "restorecon /data/misc/media." | Nick Kralevich | 2014-01-15 | 1 | -0/+1 |
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | | | |||||
| | | | | * | | | restorecon /data/misc/media. | Stephen Smalley | 2014-01-15 | 1 | -0/+1 |
| | | | |/ / / | |||||
* | | | | | | | am 7a2c2e80: am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: co... | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | am aa25204f: am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning... | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | am 93557002: am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused fu... | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | am 37fd839f: Merge "Revert "fs_mgr: correct warning on unused function parame... | Nick Kralevich | 2014-01-14 | 1 | -1/+1 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge "Revert "fs_mgr: correct warning on unused function parameter"" | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | | * | | | Revert "fs_mgr: correct warning on unused function parameter" | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
* | | | | | | | | am f6070528: am eca8ea82: am e220e9e0: am 7169b230: Merge "fs_mgr: correct wa... | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am eca8ea82: am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unus... | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | am e220e9e0: am 7169b230: Merge "fs_mgr: correct warning on unused function p... | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | am 7169b230: Merge "fs_mgr: correct warning on unused function parameter" | Nick Kralevich | 2014-01-14 | 1 | -1/+1 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge "fs_mgr: correct warning on unused function parameter" | Nick Kralevich | 2014-01-15 | 1 | -1/+1 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | fs_mgr: correct warning on unused function parameter | William Roberts | 2014-01-14 | 1 | -1/+1 |
* | | | | | | | | am 42acb531: Merge "Remove obsolete vdc call." into klp-modular-dev | Nick Kralevich | 2014-01-15 | 2 | -16/+2 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Merge "Remove obsolete vdc call." into klp-modular-dev | Nick Kralevich | 2014-01-15 | 2 | -16/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove obsolete vdc call. | Nick Kralevich | 2014-01-14 | 2 | -16/+2 |
* | | | | | | | | am 7dee721e: am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -f... | Elliott Hughes | 2014-01-15 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 42e82f80: am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protect... | Elliott Hughes | 2014-01-15 | 1 | -0/+5 |
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | am 4a8996fb: am 3352c503: Merge "Copy the bionic -fstack-protector hack into ... | Elliott Hughes | 2014-01-15 | 1 | -0/+5 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | am 3352c503: Merge "Copy the bionic -fstack-protector hack into libbacktrace." | Elliott Hughes | 2014-01-14 | 1 | -0/+5 |
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | | | |||||
| | | | * | | | | Merge "Copy the bionic -fstack-protector hack into libbacktrace." | Elliott Hughes | 2014-01-15 | 1 | -0/+5 |
| | | | |\ \ \ \ | |||||
| | | | | * | | | | Copy the bionic -fstack-protector hack into libbacktrace. | Elliott Hughes | 2014-01-14 | 1 | -0/+5 |
| | | | |/ / / / | |||||
* | | | | | | | | am b6e70fce: am 57f22625: am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd buil... | Elliott Hughes | 2014-01-15 | 3 | -14/+16 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am 57f22625: am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit." | Elliott Hughes | 2014-01-15 | 3 | -14/+16 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | am ea8dcdcf: am 21ecc30c: Merge "Fix fastbootd build for 64-bit." | Elliott Hughes | 2014-01-15 | 3 | -14/+16 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | am 21ecc30c: Merge "Fix fastbootd build for 64-bit." | Elliott Hughes | 2014-01-14 | 3 | -14/+16 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge "Fix fastbootd build for 64-bit." | Elliott Hughes | 2014-01-15 | 3 | -14/+16 |
| | | | |\ \ \ |