Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve merge conflicts of ed60788968 to mnc-dr2-dev-plus-aosp. | Todd Kjos | 2015-11-18 | 7 | -7/+43 |
|\ | |||||
| * | Actively mangage EAS schedtune nodes | Todd Kjos | 2015-11-16 | 7 | -8/+44 |
* | | Merge "Revert "libcutils: don\'t build for Windows."" am: 39a1b77381 | Josh Gao | 2015-11-17 | 1 | -22/+34 |
|\ \ | |||||
| * \ | Merge "Revert "libcutils: don\'t build for Windows."" | Josh Gao | 2015-11-17 | 1 | -22/+34 |
| |\ \ | |||||
| | * \ | Merge "Revert "libcutils: don't build for Windows."" | Josh Gao | 2015-11-17 | 1 | -22/+34 |
| | |\ \ | |||||
| | | * | | Revert "libcutils: don't build for Windows." | Josh Gao | 2015-11-17 | 1 | -22/+34 |
| | |/ / | |||||
* | | | | Merge "debuggerd: add .clang-format." am: c5a85f71ab | Josh Gao | 2015-11-17 | 1 | -0/+15 |
|\| | | | |||||
| * | | | Merge "debuggerd: add .clang-format." | Josh Gao | 2015-11-17 | 1 | -0/+15 |
| |\| | | |||||
| | * | | Merge "debuggerd: add .clang-format." | Josh Gao | 2015-11-17 | 1 | -0/+15 |
| | |\ \ | |||||
| | | * | | debuggerd: add .clang-format. | Josh Gao | 2015-11-16 | 1 | -0/+15 |
* | | | | | Merge changes Ice07f892,Ie1f082a0 am: 74a33fbcef | Josh Gao | 2015-11-17 | 2 | -35/+26 |
|\| | | | | |||||
| * | | | | Merge changes Ice07f892,Ie1f082a0 | Josh Gao | 2015-11-17 | 2 | -35/+26 |
| |\| | | | |||||
| | * | | | Merge changes Ice07f892,Ie1f082a0 | Josh Gao | 2015-11-17 | 2 | -35/+26 |
| | |\ \ \ | |||||
| | | * | | | libcutils: don't build for Windows. | Josh Gao | 2015-11-16 | 1 | -34/+22 |
| | | * | | | adb: don't link against libcutils on Windows. | Josh Gao | 2015-11-16 | 1 | -1/+4 |
| | | |/ / | |||||
* | | | | | Merge "metricsd: Don\'t upload if product id is empty." am: 0ba2606444 | Bertrand Simonnet | 2015-11-17 | 3 | -1/+14 |
|\| | | | | |||||
| * | | | | Merge "metricsd: Don\'t upload if product id is empty." | Bertrand Simonnet | 2015-11-17 | 3 | -1/+14 |
| |\| | | | |||||
| | * | | | Merge "metricsd: Don't upload if product id is empty." | Bertrand Simonnet | 2015-11-17 | 3 | -1/+14 |
| | |\ \ \ | |||||
| | | * | | | metricsd: Don't upload if product id is empty. | Bertrand SIMONNET | 2015-11-17 | 3 | -1/+14 |
| | |/ / / | |||||
* | | | | | Merge "Fix non-vendor.img configuration." am: 1337349ea1 | Junichi Uekawa | 2015-11-17 | 1 | -0/+2 |
|\| | | | | |||||
| * | | | | Merge "Fix non-vendor.img configuration." | Junichi Uekawa | 2015-11-17 | 1 | -0/+2 |
| |\| | | | |||||
| | * | | | Merge "Fix non-vendor.img configuration." | Junichi Uekawa | 2015-11-17 | 1 | -0/+2 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Fix non-vendor.img configuration. | Junichi Uekawa | 2015-11-17 | 1 | -0/+2 |
| | |/ / | |||||
* | | | | Merge "Pass screen to the device." am: c40f213b67 | Elliott Hughes | 2015-11-16 | 5 | -24/+37 |
|\| | | | |||||
| * | | | Merge "Pass screen to the device." | Elliott Hughes | 2015-11-16 | 5 | -24/+37 |
| |\| | | |||||
| | * | | Merge "Pass $TERM to the device." | Elliott Hughes | 2015-11-16 | 5 | -24/+37 |
| | |\ \ | |||||
| | | * | | Pass $TERM to the device. | Elliott Hughes | 2015-11-16 | 5 | -24/+37 |
* | | | | | Merge "fastboot: create Transport object (take 2)." am: 7a75f4e3a5 | David Pursell | 2015-11-16 | 11 | -304/+357 |
|\| | | | | |||||
| * | | | | Merge "fastboot: create Transport object (take 2)." | David Pursell | 2015-11-16 | 11 | -304/+357 |
| |\| | | | |||||
| | * | | | Merge "fastboot: create Transport object (take 2)." | David Pursell | 2015-11-16 | 11 | -304/+357 |
| | |\ \ \ | |||||
| | | * | | | fastboot: create Transport object (take 2). | David Pursell | 2015-11-16 | 11 | -304/+357 |
| | | |/ / | |||||
* | | | | | Merge "metricsd: Remove dead code." am: 695da48944 | Bertrand Simonnet | 2015-11-16 | 4 | -123/+0 |
|\| | | | | |||||
| * | | | | Merge "metricsd: Remove dead code." | Bertrand Simonnet | 2015-11-16 | 4 | -123/+0 |
| |\| | | | |||||
| | * | | | Merge "metricsd: Remove dead code." | Bertrand Simonnet | 2015-11-16 | 4 | -123/+0 |
| | |\ \ \ | |||||
| | | * | | | metricsd: Remove dead code. | Bertrand SIMONNET | 2015-11-13 | 4 | -123/+0 |
* | | | | | | Merge "Revert "liblog: resolve deadlocks"" am: e6cf1c6372 | Mark Salyzyn | 2015-11-16 | 6 | -141/+53 |
|\| | | | | | |||||
| * | | | | | Merge "Revert "liblog: resolve deadlocks"" | Mark Salyzyn | 2015-11-16 | 6 | -141/+53 |
| |\| | | | | |||||
| | * | | | | Merge "Revert "liblog: resolve deadlocks"" | Mark Salyzyn | 2015-11-16 | 6 | -141/+53 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Revert "liblog: resolve deadlocks" | Mark Salyzyn | 2015-11-16 | 6 | -141/+53 |
* | | | | | | Merge "Don\'t create profiles directory under dalvik-cache." am: 942f8ea84f | Calin Juravle | 2015-11-16 | 1 | -1/+0 |
|\| | | | | | |||||
| * | | | | | Merge "Don\'t create profiles directory under dalvik-cache." | Calin Juravle | 2015-11-16 | 1 | -1/+0 |
| |\| | | | | |||||
| | * | | | | Merge "Don't create profiles directory under dalvik-cache." | Calin Juravle | 2015-11-16 | 1 | -1/+0 |
| | |\ \ \ \ | |||||
| | | * | | | | Don't create profiles directory under dalvik-cache. | Calin Juravle | 2015-11-04 | 1 | -1/+0 |
* | | | | | | | Merge "Fix permissions for /data/nativetest{,64}/tests.txt." am: e32cb1b14c | Gilad Arnold | 2015-11-15 | 1 | -0/+2 |
|\| | | | | | | |||||
| * | | | | | | Merge "Fix permissions for /data/nativetest{,64}/tests.txt." | Gilad Arnold | 2015-11-15 | 1 | -0/+2 |
| |\| | | | | | |||||
| | * | | | | | Merge "Fix permissions for /data/nativetest{,64}/tests.txt." | Gilad Arnold | 2015-11-15 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix permissions for /data/nativetest{,64}/tests.txt. | Gilad Arnold | 2015-11-14 | 1 | -0/+2 |
| | |/ / / / / | |||||
* | | | | | | | Merge "Revert "fastboot: create Transport object."" am: 44c58471e4 | David Pursell | 2015-11-14 | 11 | -357/+304 |
|\| | | | | | | |||||
| * | | | | | | Merge "Revert "fastboot: create Transport object."" | David Pursell | 2015-11-14 | 11 | -357/+304 |
| |\| | | | | | |||||
| | * | | | | | Merge "Revert "fastboot: create Transport object."" | David Pursell | 2015-11-14 | 11 | -357/+304 |
| | |\ \ \ \ \ |