summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Remove deprecated Android.mk files"Colin Cross2016-06-022-85/+3
|\
| * Remove deprecated Android.mk filesColin Cross2016-05-262-85/+3
* | Merge "Fix liblog logtags"Treehugger Robot2016-06-011-1/+1
|\ \
| * | Fix liblog logtagsDan Willemsen2016-06-011-1/+1
* | | Merge "add a property for controlling perf_event_paranoid"Jeffrey Vander Stoep2016-06-011-0/+5
|\ \ \
| * | | add a property for controlling perf_event_paranoidDaniel Micay2016-05-311-0/+5
* | | | Merge "core: Update libchrome APIs to r395517"Luis Hector Chavez2016-06-012-1/+5
|\ \ \ \
| * | | | core: Update libchrome APIs to r395517Luis Hector Chavez2016-05-262-1/+5
* | | | | Merge "Remove invalid uses of -l and -I"Treehugger Robot2016-06-015-8/+11
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Remove invalid uses of -l and -IDan Willemsen2016-06-015-8/+11
|/ / / /
* | | | Merge "fs_mgr: pass sehandle to ext4 format routine"Treehugger Robot2016-06-012-2/+20
|\ \ \ \
| * | | | fs_mgr: pass sehandle to ext4 format routineWilliam Roberts2016-05-132-2/+20
* | | | | Merge "Kill adb's ScopedFd for unique_fd."Treehugger Robot2016-05-282-124/+80
|\ \ \ \ \
| * | | | | Kill adb's ScopedFd for unique_fd.Elliott Hughes2016-05-272-124/+80
|/ / / / /
* | | | | Merge "Kill load_file."Treehugger Robot2016-05-287-129/+46
|\ \ \ \ \
| * | | | | Kill load_file.Elliott Hughes2016-05-277-129/+46
|/ / / / /
* | | | | Merge "[adb] Followup CL to clean up adb_auth_host.cpp"Treehugger Robot2016-05-271-18/+11
|\ \ \ \ \
| * | | | | [adb] Followup CL to clean up adb_auth_host.cppYurii Zubrytskyi2016-05-271-18/+11
* | | | | | Merge "Fix misc-macro-parentheses warnings in init and other core modules."Chih-hung Hsieh2016-05-278-23/+23
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix misc-macro-parentheses warnings in init and other core modules.Chih-Hung Hsieh2016-05-188-23/+23
* | | | | | Merge "[adb] Issue the "auth" emulator command before any other one"Treehugger Robot2016-05-274-36/+76
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | [adb] Issue the "auth" emulator command before any other oneYurii Zubrytskyi2016-05-274-36/+76
|/ / / / /
* | | | | Merge "adb: retry connecting disconnected emulators instead of always looping."Yabin Cui2016-05-267-27/+210
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | adb: retry connecting disconnected emulators instead of always looping.Yabin Cui2016-05-247-27/+210
* | | | | Merge "trusty: storageproxyd: use upstream kernel headers"Michael Ryleev2016-05-251-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | trusty: storageproxyd: use upstream kernel headersMichael Ryleev2016-05-241-0/+2
|/ / / /
* | | | Merge changes I40c9ea47,I593aeed5Michael Ryleev2016-05-245-0/+3571
|\ \ \ \
| * | | | trusty: storage: add testsMichael Ryleev2016-05-182-0/+3069
| * | | | trusty: storage: add client lib for testingMichael Ryleev2016-05-183-0/+502
* | | | | Merge "adb: close ep0 on disconnection."Treehugger Robot2016-05-241-25/+24
|\ \ \ \ \
| * | | | | adb: close ep0 on disconnection.Yabin Cui2016-05-231-25/+24
|/ / / / /
* | | | | Merge "Fix SharedBuffer. Remove aref."Hans Boehm2016-05-233-72/+24
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix SharedBuffer. Remove aref.Hans Boehm2016-05-233-72/+24
* | | | | Merge "adb: check return value of register_socket_transport."Yabin Cui2016-05-211-3/+5
|\ \ \ \ \
| * | | | | adb: check return value of register_socket_transport.Yabin Cui2016-05-171-3/+5
| | |_|/ / | |/| | |
* | | | | Merge "Fix misc-macro-parentheses warnings in lmkd."Treehugger Robot2016-05-191-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix misc-macro-parentheses warnings in lmkd.Chih-Hung Hsieh2016-05-181-1/+1
| |/ / /
* | | | Merge "Fix memory order and race bugs in Refbase.h & RefBase.cpp"Hans Boehm2016-05-192-63/+146
|\ \ \ \
| * | | | Fix memory order and race bugs in Refbase.h & RefBase.cppHans Boehm2016-05-172-63/+146
* | | | | Merge "HACK: libnetutils: Remove parameters from dhcpcd service call"Treehugger Robot2016-05-191-10/+8
|\ \ \ \ \
| * | | | | HACK: libnetutils: Remove parameters from dhcpcd service callDmitry Shmidt2016-05-181-10/+8
| | |_|/ / | |/| | |
* | | | | Merge "Fix misc-macro-parentheses warnings in liblog."Chih-hung Hsieh2016-05-196-33/+33
|\ \ \ \ \
| * | | | | Fix misc-macro-parentheses warnings in liblog.Chih-Hung Hsieh2016-05-186-33/+33
| | |_|/ / | |/| | |
* | | | | Merge "Fix misc-macro-parentheses warnings in libion, libsparse, libmem*"Chih-hung Hsieh2016-05-194-6/+6
|\ \ \ \ \
| * | | | | Fix misc-macro-parentheses warnings in libion, libsparse, libmem*Chih-Hung Hsieh2016-05-184-6/+6
| |/ / / /
* | | | | Merge "adb: use asocket's close function when closing."Treehugger Robot2016-05-191-3/+1
|\ \ \ \ \
| * | | | | adb: use asocket's close function when closing.Josh Gao2016-05-181-3/+1
* | | | | | Merge "Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace."Treehugger Robot2016-05-185-5/+5
|\ \ \ \ \ \
| * | | | | | Fix misc-macro-parentheses warnings in adb, debuggerd, libbacktrace.Chih-Hung Hsieh2016-05-185-5/+5
| | |/ / / / | |/| | | |
* | | | | | Merge changes I5e56f17f,Ie3748b6c,I4e1d56a8Treehugger Robot2016-05-184-269/+403
|\ \ \ \ \ \ | | |/ / / / | |/| / / / | |_|/ / / |/| | | |