summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflicts of ed60788968 to mnc-dr2-dev-plus-aosp.Todd Kjos2015-11-187-7/+43
|\
| * Actively mangage EAS schedtune nodesTodd Kjos2015-11-167-8/+44
* | Merge "Revert "libcutils: don\'t build for Windows."" am: 39a1b77381Josh Gao2015-11-171-22/+34
|\ \
| * \ Merge "Revert "libcutils: don\'t build for Windows.""Josh Gao2015-11-171-22/+34
| |\ \
| | * \ Merge "Revert "libcutils: don't build for Windows.""Josh Gao2015-11-171-22/+34
| | |\ \
| | | * | Revert "libcutils: don't build for Windows."Josh Gao2015-11-171-22/+34
| | |/ /
* | | | Merge "debuggerd: add .clang-format." am: c5a85f71abJosh Gao2015-11-171-0/+15
|\| | |
| * | | Merge "debuggerd: add .clang-format."Josh Gao2015-11-171-0/+15
| |\| |
| | * | Merge "debuggerd: add .clang-format."Josh Gao2015-11-171-0/+15
| | |\ \
| | | * | debuggerd: add .clang-format.Josh Gao2015-11-161-0/+15
* | | | | Merge changes Ice07f892,Ie1f082a0 am: 74a33fbcefJosh Gao2015-11-172-35/+26
|\| | | |
| * | | | Merge changes Ice07f892,Ie1f082a0Josh Gao2015-11-172-35/+26
| |\| | |
| | * | | Merge changes Ice07f892,Ie1f082a0Josh Gao2015-11-172-35/+26
| | |\ \ \
| | | * | | libcutils: don't build for Windows.Josh Gao2015-11-161-34/+22
| | | * | | adb: don't link against libcutils on Windows.Josh Gao2015-11-161-1/+4
| | | |/ /
* | | | | Merge "metricsd: Don\'t upload if product id is empty." am: 0ba2606444Bertrand Simonnet2015-11-173-1/+14
|\| | | |
| * | | | Merge "metricsd: Don\'t upload if product id is empty."Bertrand Simonnet2015-11-173-1/+14
| |\| | |
| | * | | Merge "metricsd: Don't upload if product id is empty."Bertrand Simonnet2015-11-173-1/+14
| | |\ \ \
| | | * | | metricsd: Don't upload if product id is empty.Bertrand SIMONNET2015-11-173-1/+14
| | |/ / /
* | | | | Merge "Fix non-vendor.img configuration." am: 1337349ea1Junichi Uekawa2015-11-171-0/+2
|\| | | |
| * | | | Merge "Fix non-vendor.img configuration."Junichi Uekawa2015-11-171-0/+2
| |\| | |
| | * | | Merge "Fix non-vendor.img configuration."Junichi Uekawa2015-11-171-0/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix non-vendor.img configuration.Junichi Uekawa2015-11-171-0/+2
| | |/ /
* | | | Merge "Pass screen to the device." am: c40f213b67Elliott Hughes2015-11-165-24/+37
|\| | |
| * | | Merge "Pass screen to the device."Elliott Hughes2015-11-165-24/+37
| |\| |
| | * | Merge "Pass $TERM to the device."Elliott Hughes2015-11-165-24/+37
| | |\ \
| | | * | Pass $TERM to the device.Elliott Hughes2015-11-165-24/+37
* | | | | Merge "fastboot: create Transport object (take 2)." am: 7a75f4e3a5David Pursell2015-11-1611-304/+357
|\| | | |
| * | | | Merge "fastboot: create Transport object (take 2)."David Pursell2015-11-1611-304/+357
| |\| | |
| | * | | Merge "fastboot: create Transport object (take 2)."David Pursell2015-11-1611-304/+357
| | |\ \ \
| | | * | | fastboot: create Transport object (take 2).David Pursell2015-11-1611-304/+357
| | | |/ /
* | | | | Merge "metricsd: Remove dead code." am: 695da48944Bertrand Simonnet2015-11-164-123/+0
|\| | | |
| * | | | Merge "metricsd: Remove dead code."Bertrand Simonnet2015-11-164-123/+0
| |\| | |
| | * | | Merge "metricsd: Remove dead code."Bertrand Simonnet2015-11-164-123/+0
| | |\ \ \
| | | * | | metricsd: Remove dead code.Bertrand SIMONNET2015-11-134-123/+0
* | | | | | Merge "Revert "liblog: resolve deadlocks"" am: e6cf1c6372Mark Salyzyn2015-11-166-141/+53
|\| | | | |
| * | | | | Merge "Revert "liblog: resolve deadlocks""Mark Salyzyn2015-11-166-141/+53
| |\| | | |
| | * | | | Merge "Revert "liblog: resolve deadlocks""Mark Salyzyn2015-11-166-141/+53
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Revert "liblog: resolve deadlocks"Mark Salyzyn2015-11-166-141/+53
* | | | | | Merge "Don\'t create profiles directory under dalvik-cache." am: 942f8ea84fCalin Juravle2015-11-161-1/+0
|\| | | | |
| * | | | | Merge "Don\'t create profiles directory under dalvik-cache."Calin Juravle2015-11-161-1/+0
| |\| | | |
| | * | | | Merge "Don't create profiles directory under dalvik-cache."Calin Juravle2015-11-161-1/+0
| | |\ \ \ \
| | | * | | | Don't create profiles directory under dalvik-cache.Calin Juravle2015-11-041-1/+0
* | | | | | | Merge "Fix permissions for /data/nativetest{,64}/tests.txt." am: e32cb1b14cGilad Arnold2015-11-151-0/+2
|\| | | | | |
| * | | | | | Merge "Fix permissions for /data/nativetest{,64}/tests.txt."Gilad Arnold2015-11-151-0/+2
| |\| | | | |
| | * | | | | Merge "Fix permissions for /data/nativetest{,64}/tests.txt."Gilad Arnold2015-11-151-0/+2
| | |\ \ \ \ \
| | | * | | | | Fix permissions for /data/nativetest{,64}/tests.txt.Gilad Arnold2015-11-141-0/+2
| | |/ / / / /
* | | | | | | Merge "Revert "fastboot: create Transport object."" am: 44c58471e4David Pursell2015-11-1411-357/+304
|\| | | | | |
| * | | | | | Merge "Revert "fastboot: create Transport object.""David Pursell2015-11-1411-357/+304
| |\| | | | |
| | * | | | | Merge "Revert "fastboot: create Transport object.""David Pursell2015-11-1411-357/+304
| | |\ \ \ \ \