summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Merge "Added a "Dump Theme" option to expose all resources." into idea133ub-tools-idea133-releaseSiva Velusamy2014-09-199-1/+371
|\
| * Added a "Dump Theme" option to expose all resources.Jon Miranda2014-09-199-1/+371
|/
* Merge "Add support for 64 bit native dumps." into idea133Siva Velusamy2014-09-126-18/+62
|\
| * Add support for 64 bit native dumps.Christopher Ferris2014-09-116-18/+62
|/
* Merge "Remove bouncy castle (unused) library definition" into idea133Siva Velusamy2014-09-041-13/+0
|\
| * Remove bouncy castle (unused) library definitionSiva Velusamy2014-09-031-13/+0
* | Merge "Add Trove4J library definition" into idea133Siva Velusamy2014-09-041-0/+12
|\|
| * Add Trove4J library definitionSiva Velusamy2014-09-031-0/+12
|/
* Merge "Removed "get" prefix and "()" suffix from property name labels." into ...gradle_0.13.3gradle_0.13.2gradle_0.13.1gradle_0.13.0Siva Velusamy2014-08-192-6/+76
|\
| * Removed "get" prefix and "()" suffix from property name labels.Jon Miranda2014-07-292-6/+76
* | Merge "Skip duplicates devices" into idea133Deepanshu Gupta2014-08-155-4/+9
|\ \
| * | Skip duplicates devicesDeepanshu Gupta2014-08-145-4/+9
* | | Merge "Minor: Update intelliiJ config files." into idea133Deepanshu Gupta2014-08-155-2/+5
|\ \ \ | |/ / |/| |
| * | Minor: Update intelliiJ config files.Deepanshu Gupta2014-08-145-2/+5
|/ /
* | Merge "Fix hv classpath + add @Override annotation" into idea133Siva Velusamy2014-08-142-0/+3
|\ \
| * | Fix hv classpath + add @Override annotationSiva Velusamy2014-08-142-0/+3
|/ /