aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Update Guava 15.0 -> 17.0" into studio-1.0-devSiva Velusamy2014-10-275-13/+30
|\
| * Update Guava 15.0 -> 17.0Siva Velusamy2014-10-275-13/+30
|/
* Merge "find_java: new method to search in a custom path" into studio-1.0-devDavid Herman2014-10-102-1/+17
|\
| * find_java: new method to search in a custom pathDavid Herman2014-10-102-1/+17
* | Merge "find_java.sln (and related project files) updated" into studio-1.0-devDavid Herman2014-10-1014-803/+508
|\ \ | |/
| * find_java.sln (and related project files) updatedDavid Herman2014-10-1014-803/+508
|/
* Merge "Adjust ADT to new ITestRunListener changes." into studio-1.0-devSiva Velusamy2014-09-232-10/+33
|\
| * Adjust ADT to new ITestRunListener changes.Brett Chabot2014-09-232-10/+33
|/
* Merge "FindJava2+WinLauncher2 MFC app for Windows." into idea133Raphael Moll2014-09-1928-0/+2741
|\
| * FindJava2+WinLauncher2 MFC app for Windows.Raphael Moll2014-09-1628-0/+2741
|/
* Merge "Track lint API changes in the Eclipse lint integration" into idea133Tor Norbye2014-09-1510-26/+34
|\
| * Track lint API changes in the Eclipse lint integrationTor Norbye2014-09-1510-26/+34
|/
* Merge "Update tools to revision 23.0.4" into idea133Siva Velusamy2014-09-051-1/+1
|\
| * Update tools to revision 23.0.4Raphael Moll2014-09-051-1/+1
|/
* Merge "Update ADT version to 23.0.4" into idea133Raphael Moll2014-09-0353-77/+77
|\
| * Update ADT version to 23.0.4Raphael Moll2014-09-0353-77/+77
|/
* Merge "Match language-specific flags before default locale country matches" i...Tor Norbye2014-09-021-11/+12
|\
| * Merge "Match language-specific flags before default locale country matches" i...Tor Norbye2014-08-291-11/+12
| |\
| | * Match language-specific flags before default locale country matchesTor Norbye2014-08-291-11/+12
| |/
* | Merge "emulator/opengl: Cleanup build files + remove obsolete tests."David 'Digit' Turner2014-08-2962-6756/+84
|\ \ | |/ |/|
| * emulator/opengl: Cleanup build files + remove obsolete tests.David 'Digit' Turner2014-08-2762-6756/+84
|/
* Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-181-1/+1
|\
| * Merge "gltrace: Increase launch timeout" into idea133Siva Velusamy2014-08-161-1/+1
| |\
| | * gltrace: Increase launch timeoutSiva Velusamy2014-08-181-1/+1
| |/
* | Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
|\ \ | |/
| * Merge "Change Device List to Device Collection." into idea133Deepanshu Gupta2014-08-158-21/+27
| |\
| | * Change Device List to Device Collection.Deepanshu Gupta2014-08-158-21/+27
| |/
* | Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
|\ \ | |/
| * Merge "gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBS" into idea133Siva Velusamy2014-08-141-2/+2
| |\
| | * gltrace: Increase TEXTURE_UNIT_COUNT and MAX_VERTEX_ATTRIBSSiva Velusamy2014-08-141-2/+2
| |/
* | Merge "Support dynamic lib name without ".dylib" on Mac"David Turner2014-07-233-4/+44
|\ \
| * | Support dynamic lib name without ".dylib" on MacTina Zhang2014-07-273-4/+44
|/ /
* | Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
|\ \ | |/
| * Merge "monitor: Move from sdk/ to sdk/eclipse" into idea133Siva Velusamy2014-07-234-4/+2
| |\
| | * monitor: Move from sdk/ to sdk/eclipseSiva Velusamy2014-07-234-4/+2
| |/
* | Merge "Merge commit 'ae461d3' into mmerge"Siva Velusamy2014-07-234-239/+0
|\ \
| * \ Merge commit 'ae461d3' into mmergeSiva Velusamy2014-07-234-239/+0
| |\ \ |/ / / | | _
| * Merge "monitor: Remove old build scripts and instructions" into idea133Siva Velusamy2014-07-234-230/+0
| |\
| | * monitor: Remove old build scripts and instructionsSiva Velusamy2014-07-234-230/+0
| |/
* | Merge "Include JDT as a required dependency" into idea133Siva Velusamy2014-07-221-0/+1
|\ \ | |/
| * Merge "Include JDT as a required dependency" into idea133Siva Velusamy2014-07-221-0/+1
| |\
| | * Include JDT as a required dependencySiva Velusamy2014-07-221-0/+1
| |/
* | Merge "Add NDK plugin to ADT package feature" into idea133Siva Velusamy2014-07-221-0/+1
|\ \ | |/
| * Merge "Add NDK plugin to ADT package feature" into idea133Siva Velusamy2014-07-221-0/+1
| |\
| | * Add NDK plugin to ADT package featureSiva Velusamy2014-07-211-0/+1
* | | Merge "Update Eclipse plugins\' version from 23.0.2 -> 23.0.3" into idea133Siva Velusamy2014-07-2252-76/+76
|\ \ \ | |/ /
| * | Merge "Update Eclipse plugins' version from 23.0.2 -> 23.0.3" into idea133Siva Velusamy2014-07-2252-76/+76
| |\ \ | | |/
| | * Update Eclipse plugins' version from 23.0.2 -> 23.0.3Siva Velusamy2014-07-2152-76/+76
| |/
* | Merge "Don\'t compress apks." into idea133Xavier Ducrohet2014-07-211-0/+4
|\ \ | |/
| * Merge "Don't compress apks." into idea133Xavier Ducrohet2014-07-201-0/+4
| |\
generated by cgit v1.1 at 2025-02-10 07:14:33 +0000