summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Change the CHECK failure into function failure." into oc-devDaichi Hirono2017-05-171-1/+6
|\
| * Merge "Change the CHECK failure into function failure." into oc-devTreeHugger Robot2017-05-161-1/+6
| |\
| | * Change the CHECK failure into function failure.Daichi Hirono2017-05-161-1/+6
* | | Merge "Use SO_SNDBUFFORCE instead of SO_SNDBUF" into oc-devDaichi Hirono2017-05-171-2/+2
|\| |
| * | Merge "Use SO_SNDBUFFORCE instead of SO_SNDBUF" into oc-devTreeHugger Robot2017-05-161-2/+2
| |\ \
| | * | Use SO_SNDBUFFORCE instead of SO_SNDBUFDaichi Hirono2017-04-281-2/+2
* | | | resolve merge conflicts of fbe942724 to oc-dev-plus-aospJiyong Park2017-05-177-13/+192
|\| | |
| * | | Merge changes from topic 'synchronize_vndk-sp' into oc-devTreeHugger Robot2017-05-167-13/+192
| |\ \ \
| | * | | add libvndksupport.so to ll-ndkJiyong Park2017-05-141-3/+3
| | * | | libbacktrace is VNDK-SPJiyong Park2017-05-141-13/+3
| | * | | add libvndksupportJiyong Park2017-05-146-0/+189
* | | | | Add vendor_available:true to libcrypto_utilsVijay Venkatraman2017-05-161-0/+1
|\| | | |
| * | | | Add vendor_available:true to libcrypto_utilsVijay Venkatraman2017-05-161-0/+1
* | | | | Merge "libnetutils: Restore dhcptool" am: b03d5a4ba6 am: 1f47a6ba48Dmitry Shmidt2017-05-162-0/+61
|\ \ \ \ \
| * \ \ \ \ Merge "libnetutils: Restore dhcptool" am: b03d5a4ba6Dmitry Shmidt2017-05-162-0/+61
| |\ \ \ \ \
| | * \ \ \ \ Merge "libnetutils: Restore dhcptool"Dmitry Shmidt2017-05-162-0/+61
| | |\ \ \ \ \
| | | * \ \ \ \ Merge "libnetutils: Restore dhcptool"Treehugger Robot2017-05-162-0/+61
| | | |\ \ \ \ \
| | | | * | | | | libnetutils: Restore dhcptoolDmitry Shmidt2017-05-162-0/+61
* | | | | | | | | Merge "Remove libbase's trivial libutils-headers dependency." am: 337b4dd661 ...Elliott Hughes2017-05-162-3/+3
|\| | | | | | | |
| * | | | | | | | Merge "Remove libbase's trivial libutils-headers dependency." am: 337b4dd661Elliott Hughes2017-05-162-3/+3
| |\| | | | | | |
| | * | | | | | | Merge "Remove libbase's trivial libutils-headers dependency."Elliott Hughes2017-05-162-3/+3
| | |\| | | | | |
| | | * | | | | | Merge "Remove libbase's trivial libutils-headers dependency."Treehugger Robot2017-05-162-3/+3
| | | |\ \ \ \ \ \
| | | | * | | | | | Remove libbase's trivial libutils-headers dependency.Elliott Hughes2017-05-152-3/+3
* | | | | | | | | | Merge "logd: remove start filtration from flushTo" am: c8c49988b1 am: 27d54dd4acMark Salyzyn2017-05-161-8/+3
|\| | | | | | | | |
| * | | | | | | | | Merge "logd: remove start filtration from flushTo" am: c8c49988b1Mark Salyzyn2017-05-161-8/+3
| |\| | | | | | | |
| | * | | | | | | | Merge "logd: remove start filtration from flushTo"Mark Salyzyn2017-05-161-8/+3
| | |\| | | | | | |
| | | * | | | | | | Merge "logd: remove start filtration from flushTo"Treehugger Robot2017-05-161-8/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | logd: remove start filtration from flushToMark Salyzyn2017-05-151-8/+3
* | | | | | | | | | | first stage mount: removing the requirement of by-name prefix for AVBBowgo Tsai2017-05-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | first stage mount: removing the requirement of by-name prefix for AVBBowgo Tsai2017-05-156-134/+189
* | | | | | | | | | | init: moving get_block_device_symlinks() to public APIBowgo Tsai2017-05-150-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | init: moving get_block_device_symlinks() to public APIBowgo Tsai2017-05-152-2/+3
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge "fs_mgr: support different dm-verity error modes" am: b9b95ee3a9 am: d1...Bowgo Tsai2017-05-151-75/+95
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge "fs_mgr: support different dm-verity error modes" am: b9b95ee3a9Bowgo Tsai2017-05-151-75/+95
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge "fs_mgr: support different dm-verity error modes"Bowgo Tsai2017-05-151-75/+95
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | Merge "fs_mgr: support different dm-verity error modes"Treehugger Robot2017-05-151-75/+95
| | | |\ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | | * | | | | | fs_mgr: support different dm-verity error modesBowgo Tsai2017-05-131-75/+95
* | | | | | | | | | Merge "logcat: -v thread help missing" am: 3cfc1ab89d am: 6f9051ea1bMark Salyzyn2017-05-151-0/+1
|\| | | | | | | | |
| * | | | | | | | | Merge "logcat: -v thread help missing" am: 3cfc1ab89dMark Salyzyn2017-05-151-0/+1
| |\| | | | | | | |
| | * | | | | | | | Merge "logcat: -v thread help missing"Mark Salyzyn2017-05-151-0/+1
| | |\| | | | | | |
| | | * | | | | | | Merge "logcat: -v thread help missing"Treehugger Robot2017-05-151-0/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | logcat: -v thread help missingMark Salyzyn2017-05-151-0/+1
| | | | | |_|/ / / / | | | | |/| | | | |
* | | | | | | | | | Merge changes I8e8e0963,I3c714f63,Id157412e,Ib7c26fbd am: 55ddb99527 am: 66ca...Josh Gao2017-05-152-43/+78
|\| | | | | | | | |
| * | | | | | | | | Merge changes I8e8e0963,I3c714f63,Id157412e,Ib7c26fbd am: 55ddb99527Josh Gao2017-05-152-43/+78
| |\| | | | | | | |
| | * | | | | | | | Merge changes I8e8e0963,I3c714f63,Id157412e,Ib7c26fbdJosh Gao2017-05-152-43/+78
| | |\| | | | | | |
| | | * | | | | | | Merge changes I8e8e0963,I3c714f63,Id157412e,Ib7c26fbdJosh Gao2017-05-152-43/+78
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | | * | | | | | adb: libusb: recognize devices with multiple interfaces.Josh Gao2017-05-121-3/+3
| | | | * | | | | | adb: libusb: wait for devices to become accessible.Josh Gao2017-05-121-4/+47
| | | | * | | | | | adb: libusb: switch to hotplug for device detection.Josh Gao2017-05-121-36/+34
| | | | * | | | | | adb: silence noise.Josh Gao2017-05-121-6/+0