summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am bdae9bf2: resolved conflicts for 70808827 to stage-aosp-masterSergio Giro2015-10-015-1329/+0
|\
| * resolved conflicts for 70808827 to stage-aosp-masterSergio Giro2015-10-015-1329/+0
| |\
| | * Merge "system/core: remove BasicHashtable"Sergio Giro2015-10-015-1329/+0
| | |\
| | | * system/core: remove BasicHashtableSergio Giro2015-10-015-1329/+0
* | | | am 3f43729a: am 7c262abe: Merge "crash_reporter: Set Version and Product ID"Steve Fung2015-10-013-16/+14
|\| | |
| * | | am 7c262abe: Merge "crash_reporter: Set Version and Product ID"Steve Fung2015-10-013-16/+14
| |\| |
| | * | Merge "crash_reporter: Set Version and Product ID"Steve Fung2015-10-013-16/+14
| | |\ \ | | | |/ | | |/|
| | | * crash_reporter: Set Version and Product IDSteve Fung2015-09-303-16/+14
* | | | am cabf610d: am d29f10cd: Merge "Fix build break due to unknown pragma (on gc...Stephen Hines2015-10-011-0/+4
|\| | |
| * | | am d29f10cd: Merge "Fix build break due to unknown pragma (on gcc)."Stephen Hines2015-10-011-0/+4
| |\| |
| | * | Merge "Fix build break due to unknown pragma (on gcc)."Stephen Hines2015-10-011-0/+4
| | |\ \
| | | * | Fix build break due to unknown pragma (on gcc).Stephen Hines2015-09-301-0/+4
| | |/ /
* | | | am f141312c: am dc91dafa: Merge "Ignore explicit infinite recursion."Stephen Hines2015-10-011-0/+5
|\| | |
| * | | am dc91dafa: Merge "Ignore explicit infinite recursion."Stephen Hines2015-10-011-0/+5
| |\| |
| | * | Merge "Ignore explicit infinite recursion."Stephen Hines2015-10-011-0/+5
| | |\ \
| | | * | Ignore explicit infinite recursion.Stephen Hines2015-09-291-0/+5
* | | | | am 4b3ee266: am ffa866f5: Merge "adb: detect sockets in CLOSE_WAIT state to p...Yabin Cui2015-10-013-39/+64
|\| | | |
| * | | | am ffa866f5: Merge "adb: detect sockets in CLOSE_WAIT state to prevent socket...Yabin Cui2015-10-013-39/+64
| |\| | |
| | * | | Merge "adb: detect sockets in CLOSE_WAIT state to prevent socket leak on linux."Yabin Cui2015-10-013-39/+64
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | adb: detect sockets in CLOSE_WAIT state to prevent socket leak on linux.Yabin Cui2015-09-303-39/+64
* | | | | am de3faec6: am fd18d9e2: Merge "adb: put legacy shell: service back in."David Pursell2015-09-306-47/+122
|\| | | |
| * | | | am fd18d9e2: Merge "adb: put legacy shell: service back in."David Pursell2015-09-306-47/+122
| |\| | |
| | * | | Merge "adb: put legacy shell: service back in."David Pursell2015-09-306-47/+122
| | |\ \ \
| | | * | | adb: put legacy shell: service back in.David Pursell2015-09-306-47/+122
* | | | | | am 351c211c: am 447356dd: Merge "liblog: logcat: Add year and zone to date on...Mark Salyzyn2015-09-304-17/+162
|\| | | | |
| * | | | | am 447356dd: Merge "liblog: logcat: Add year and zone to date on each line"Mark Salyzyn2015-09-304-17/+162
| |\| | | |
| | * | | | Merge "liblog: logcat: Add year and zone to date on each line"Mark Salyzyn2015-09-304-17/+162
| | |\ \ \ \
| | | * | | | liblog: logcat: Add year and zone to date on each lineMark Salyzyn2015-09-244-17/+162
* | | | | | | am 900362c3: am 1b2fb587: Merge changes I42162365,Ia72f1305,I57d1f86c,I026d074eMark Salyzyn2015-09-306-147/+261
|\| | | | | |
| * | | | | | am 1b2fb587: Merge changes I42162365,Ia72f1305,I57d1f86c,I026d074eMark Salyzyn2015-09-306-147/+261
| |\| | | | |
| | * | | | | Merge changes I42162365,Ia72f1305,I57d1f86c,I026d074eMark Salyzyn2015-09-306-147/+261
| | |\ \ \ \ \
| | | * | | | | logd: klogd deal with nuls in dmesgMark Salyzyn2015-09-295-94/+147
| | | * | | | | logd: log_strtok_r deal with nulsMark Salyzyn2015-09-293-32/+67
| | | * | | | | liblog: logprint: printable nulMark Salyzyn2015-09-291-1/+1
| | | * | | | | logd: klogd: sniff for time correction on MediatekMark Salyzyn2015-09-291-39/+65
* | | | | | | | am 049399e5: am ad2a5a89: Merge "fs_mgr: trigger dm-verity error handling for...Sami Tolvanen2015-09-300-0/+0
|\| | | | | | |
| * | | | | | | am ad2a5a89: Merge "fs_mgr: trigger dm-verity error handling for invalid sign...Sami Tolvanen2015-09-301-7/+47
| |\| | | | | |
| | * | | | | | Merge "fs_mgr: trigger dm-verity error handling for invalid signatures"Sami Tolvanen2015-09-301-7/+47
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | fs_mgr: trigger dm-verity error handling for invalid signaturesSami Tolvanen2015-09-251-7/+47
* | | | | | | | am b5a00d6b: am e0453334: Merge "system/core: remove methods returning Shared...Sergio Giro2015-09-304-14/+0
|\| | | | | | |
| * | | | | | | am e0453334: Merge "system/core: remove methods returning SharedBuffer in Str...Sergio Giro2015-09-304-14/+0
| |\| | | | | |
| | * | | | | | Merge "system/core: remove methods returning SharedBuffer in String8, String16"Sergio Giro2015-09-304-14/+0
| | |\ \ \ \ \ \
| | | * | | | | | system/core: remove methods returning SharedBuffer in String8, String16Sergio Giro2015-09-304-14/+0
| | | |/ / / / /
* | | | | | | | am 0e7fb13d: libutils: fix compile error in SharedBufferTestSergio Giro2015-09-300-0/+0
|\| | | | | | |
| * | | | | | | libutils: fix compile error in SharedBufferTestSergio Giro2015-09-301-2/+2
* | | | | | | | am 8e2c8208: am 730fdbb1: Merge "system/core: change LruCache to use unordere...Sergio Giro2015-09-302-72/+83
|\| | | | | | |
| * | | | | | | am 730fdbb1: Merge "system/core: change LruCache to use unordered_set instead...Sergio Giro2015-09-302-72/+83
| |\| | | | | |
| | * | | | | | Merge "system/core: change LruCache to use unordered_set instead of BasicHash...Sergio Giro2015-09-302-72/+83
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | system/core: change LruCache to use unordered_set instead of BasicHashTableSergio Giro2015-09-302-72/+83
| | | |/ / / /
* | | | | | | am db364d25: am 8ec2d8fe: Merge "logd: klogd and Mediatek part deux"Mark Salyzyn2015-09-301-7/+21
|\| | | | | |