aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Delete unused parts of sdk" into emu-master-devemu-gn-devemu-2.8-releaseemu-2.7-releaseemu-2.6-releaseemu-2.5-releaseemu-2.4-releaseJoe Baker-Malone2017-02-032641-325971/+0
|\
| * Delete unused parts of sdkJoe Baker-Malone2017-02-022641-325971/+0
|/
* Merge "Removing source.properties: it was moved to qemu." into emu-master-devJoe Baker-Malone2016-10-202-7/+0
|\
| * Removing source.properties: it was moved to qemu.Joe Baker-Malone2016-10-132-7/+0
|/
* Merge "Bump tools version to 25.3.0 for emulator 2.3 release" into emu-master...Treehugger Robot2016-10-1150-62/+62
|\
| * Bump tools version to 25.3.0 for emulator 2.3 releasebohu2016-10-1150-62/+62
* | Merge "Trim \r\n from systrace output only for API < N" into emu-master-devLingfeng Yang2016-10-102-2/+15
|\ \
| * | Trim \r\n from systrace output only for API < NLingfeng Yang2016-10-102-2/+15
* | | Merge "Bump tools version to 25.2.3 for emulator 2.2 release" into emu-master...Treehugger Robot2016-10-0750-62/+62
|\ \ \ | |/ / |/| / | |/
| * Bump tools version to 25.2.3 for emulator 2.2 releasebohu2016-10-0750-62/+62
|/
* Merge "Emulator: trigger a build" into emu-master-devBo Hu2016-08-081-0/+4
|\
| * Emulator: trigger a buildbohu2016-08-071-0/+4
|/
* Merge "Revert "Bump to 25.2.2.1"" into emu-master-devBo Hu2016-08-071-1/+1
|\
| * Revert "Bump to 25.2.2.1"Bo Hu2016-08-071-1/+1
* | Merge "Bump to 25.2.2.1" into emu-master-devBo Hu2016-08-071-1/+1
|\|
| * Bump to 25.2.2.1bohu2016-08-061-1/+1
|/
* Merge "Bump tools version to 25.2.2 for emulator 2.2 release" into emu-master...Prathmesh Prabhu2016-07-2750-62/+62
|\
| * Bump tools version to 25.2.2 for emulator 2.2 releasePrathmesh Prabhu2016-07-2750-62/+62
* | Merge "Bump tools version to 25.2.1 for emulator 2.2 release" into emu-master...Prathmesh Prabhu2016-07-2750-62/+62
|\|
| * Bump tools version to 25.2.1 for emulator 2.2 releasePrathmesh Prabhu2016-07-2750-62/+62
|/
* Merge "Fix systrace asset path usage" into emu-master-devBo Hu2016-07-262-19/+22
|\
| * Fix systrace asset path usageChris Craik2016-07-222-19/+22
|/
* Merge "Bump tools version to 25.2.0 for emulator 2.2 release" into emu-master...Bo Hu2016-06-0950-62/+62
|\
| * Bump tools version to 25.2.0 for emulator 2.2 releasebohu2016-06-0850-62/+62
|/
* Merge "Bump tools version to 25.1.7 for emulator 2.0 release" into emu-master...Prathmesh Prabhu2016-05-1750-62/+62
|\
| * Bump tools version to 25.1.7 for emulator 2.0 releasePrathmesh Prabhu2016-05-1750-62/+62
|/
* Merge "Bump tools version to 25.1.6 for emulator 2.0 release" into emu-master...Bo Hu2016-05-0950-62/+62
|\
| * Bump tools version to 25.1.6 for emulator 2.0 releasebohu2016-05-0950-62/+62
|/
* Merge "Bump tools version to 25.1.5 for emulator 2.0 release" into emu-master...Bo Hu2016-05-0350-62/+62
|\
| * Bump tools version to 25.1.5 for emulator 2.0 releasebohu2016-05-0350-62/+62
|/
* Merge "Bump tools version to 25.1.4 for emulator 2.0 release" into emu-master...Bo Hu2016-04-2550-62/+62
|\
| * Bump tools version to 25.1.4 for emulator 2.0 releasebohu2016-04-2550-62/+62
* | Merge "Account for new systrace html asset file path" into emu-master-devBo Hu2016-04-251-1/+18
|\ \ | |/ |/|
| * Account for new systrace html asset file pathChris Craik2016-04-251-1/+18
|/
* Merge "Revert "Account for new systrace html asset file path"" into emu-maste...Bo Hu2016-04-251-15/+1
|\
| * Revert "Account for new systrace html asset file path"Bo Hu2016-04-251-15/+1
* | Merge "Account for new systrace html asset file path" into emu-master-devBo Hu2016-04-251-1/+15
|\|
| * Account for new systrace html asset file pathChris Craik2016-04-211-1/+15
|/
* Merge "Bump tools version to 25.1.3 for emulator 2.0 release" into emu-master...Bo Hu2016-04-1550-62/+62
|\
| * Bump tools version to 25.1.3 for emulator 2.0 releasebohu2016-04-1550-62/+62
|/
* Merge "Bump tools version to 25.1.2 for emulator 2.0 release" into emu-master...Bo Hu2016-04-0550-62/+62
|\
| * Bump tools version to 25.1.2 for emulator 2.0 releasebohu2016-04-0450-62/+62
|/
* Merge "Bump tools version to 25.1.1 for emulator 2.0 release" into emu-master...Bo Hu2016-04-0150-62/+62
|\
| * Bump tools version to 25.1.1 for emulator 2.0 releasebohu2016-03-3150-62/+62
|/
* Merge "Bump tools version to 25.1.0 for emulator 2.0 release" into emu-master...Bo Hu2016-03-2450-62/+62
|\
| * Bump tools version to 25.1.0 for emulator 2.0 releasebohu2016-03-2350-62/+62
|/
* Merge "Remove the button images formerly used for dynamic skins" into emu-mas...Jim Kaye2016-03-1615-142/+0
|\
| * Remove the button images formerly used for dynamic skinsJim Kaye2016-03-1515-142/+0
|/
* Merge "Revert "Remove support for dynamic skins"" into emu-master-devJim Kaye2016-03-1514-0/+138
|\
| * Revert "Remove support for dynamic skins"Jim Kaye2016-03-1514-0/+138
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 11:31:27 +0000