summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Only rotate screenshots on pre-M devices." into emu-master-devemu-master-devemu-2.3-releaseemu-2.2-releaseBo Hu2016-02-181-5/+7
|\
| * Only rotate screenshots on pre-M devices.Allen Hair2016-02-181-5/+7
|/
* Merge "Add missing space in stats-permission message" into studio-1.4-devstudio-1.4-devemu-1.5-releaseemu-1.4-releaseDana Dahlstrom2015-08-061-1/+1
|\
| * Add missing space in stats-permission messageDana Dahlstrom2015-08-061-1/+1
|/
* Merge "Android.bat: Quoted copy args" into studio-1.4-devDavid Herman2015-08-041-14/+14
|\
| * Android.bat: Quoted copy argsDavid Herman2015-08-041-14/+14
|/
* Merge "Quote xcopy arguments to fix "Invalid number of parameters" error" int...David Herman2015-08-041-2/+2
|\
| * Quote xcopy arguments to fix "Invalid number of parameters" errorDavid Herman2015-08-041-2/+2
|/
* Merge "Add load base to relative pcs computed." into studio-1.4-devChristopher Ferris2015-07-291-1/+123
|\
| * Add load base to relative pcs computed.Christopher Ferris2015-07-221-1/+123
|/
* Merge "Fix SdkManagerTest2." into studio-1.4-devChris Warrington2015-07-201-7/+8
|\
| * Fix SdkManagerTest2.Chris Warrington2015-07-171-7/+8
|/
* Merge "Fixing test broken by 159303" into studio-1.4-devJoe Baker-Malone2015-07-161-78/+82
|\
| * Fixing test broken by 159303Joe Baker-Malone2015-07-151-78/+82
|/
* Merge "Update SdkManagerUpgradeTest to be aware of repo-11.xml" into studio-1...gradle_1.3.1gradle_1.3.0-beta4gradle_1.3.0-beta3gradle_1.3.0-beta2studio-1.3-releasestudio-1.3-devTor Norbye2015-06-021-0/+4
|\
| * Update SdkManagerUpgradeTest to be aware of repo-11.xmlTor Norbye2015-06-021-0/+4
|/
* Merge "Fix test that assumed that previews were disabled by default" into stu...gradle_1.3.0-beta1studio-1.4-releaseSiva Velusamy2015-05-211-1/+4
|\
| * Fix test that assumed that previews were disabled by defaultSiva Velusamy2015-05-211-1/+4
|/
* Merge "android.bat: copy gson.jar to tmp folder while running" into studio-1....Siva Velusamy2015-05-091-0/+1
|\
| * android.bat: copy gson.jar to tmp folder while runningSiva Velusamy2015-05-081-0/+1
|/
* Merge "Fix gson dependency in IDEA project files." into studio-1.3-devXavier Ducrohet2015-05-051-3/+3
|\
| * Fix gson dependency in IDEA project files.Xavier Ducrohet2015-05-041-3/+3
|/
* Merge "Add gson library" into studio-1.3-devSiva Velusamy2015-05-041-0/+11
|\
| * Add gson librarySiva Velusamy2015-05-041-0/+11
|/
* Merge "update sdkmanager main to match new API." into studio-1.3-devXavier Ducrohet2015-05-011-5/+6
|\
| * update sdkmanager main to match new API.Xavier Ducrohet2015-04-211-5/+6
|/
* Merge "Adopting refactoring from 145321" into studio-1.3-devJoe Baker-Malone2015-04-063-3/+3
|\
| * Adopting refactoring from 145321Joe Baker-Malone2015-04-063-3/+3
* | Merge "Fix project structure." into studio-1.3-devDeepanshu Gupta2015-04-064-3/+14
|\ \ | |/ |/|
| * Fix project structure.Deepanshu Gupta2015-04-064-3/+14
|/
* Merge "Switch to using layoutlib-api-base.iml" into studio-1.3-devDeepanshu Gupta2015-04-041-2/+2
|\
| * Switch to using layoutlib-api-base.imlDeepanshu Gupta2015-04-041-2/+2
|/
* Merge "Add JUnit4 library definition to IDEA" into studio-1.3-devSiva Velusamy2015-03-111-0/+11
|\
| * Add JUnit4 library definition to IDEASiva Velusamy2015-03-111-0/+11
|/
* Merge "Fixing breakage caused by 121088" into studio-1.1-devgradle_1.2.3gradle_1.2.2gradle_1.2.1gradle_1.2.0-rc1gradle_1.2.0-beta1gradle_1.2.0gradle_1.1.3gradle_1.1.2gradle_1.1.1gradle_1.1.0-rc3gradle_1.1.0-rc2gradle_1.1.0-rc1gradle_1.1.0studio-1.2-releasestudio-1.2-devstudio-1.1-releasestudio-1.1-devJoe Baker-Malone2015-01-021-1/+1
|\
| * Fixing breakage caused by 121088Joe Baker-Malone2015-01-021-1/+1
|/
* Merge "82983: Update SDK Download SSL URLs in Android SDK Tools & Android Stu...Tor Norbye2014-12-203-242/+37
|\
| * 82983: Update SDK Download SSL URLs in Android SDK Tools & Android StudioTor Norbye2014-12-193-242/+37
|/
* Merge "Fix eclipse .classpath files" into studio-1.1-devSiva Velusamy2014-12-162-1/+2
|\
| * Fix eclipse .classpath filesSiva Velusamy2014-12-162-1/+2
|/
* Merge "Chimpchat: use shell timeout from DdmPreferences instead of hardcoding...studio-1.0-devXavier Ducrohet2014-12-021-3/+2
|\
| * Chimpchat: use shell timeout from DdmPreferences instead of hardcodingVojtech Bocek2014-12-021-3/+2
|/
* Merge "Enabling cmd.exe extensions for android.bat" into studio-1.0-devXavier Ducrohet2014-11-211-1/+1
|\
| * Enabling cmd.exe extensions for android.batDavid Herman2014-11-201-1/+1
|/
* Merge "Fixing NPE when creating new device in old AVD manager" into studio-1....gradle_0.14.4gradle_0.14.3gradle_0.14.2gradle_0.14.1gradle_0.14.0Joe Baker-Malone2014-10-201-3/+5
|\
| * Fixing NPE when creating new device in old AVD managerJoe Baker-Malone2014-10-161-3/+5
* | Merge "Update unit tests for SWT-based SDK manager with new devices" into stu...Tor Norbye2014-10-192-45/+63
|\ \ | |/ |/|
| * Update unit tests for SWT-based SDK manager with new devicesTor Norbye2014-10-192-45/+63
|/
* Merge "AVD Manager: no longer provide addon's base target sys-img." into stud...Raphael Moll2014-10-101-3/+9
|\
| * AVD Manager: no longer provide addon's base target sys-img.Raphael Moll2014-10-101-3/+9
|/
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-04 14:59:36 +0000