aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 7ad5f75b: Merge "Remove ADT branding from p2 repo" into idea133 automerge:...Siva Velusamy2014-06-211-3/+0
|\
| * Merge "Remove ADT branding from p2 repo" into idea133Siva Velusamy2014-06-211-3/+0
| |\
| | * Merge "Remove ADT branding from p2 repo" into idea133Siva Velusamy2014-06-201-3/+0
| | |\
| | | * Remove ADT branding from p2 repoSiva Velusamy2014-06-211-3/+0
| | |/
* | | am f2be0827: Merge "Enable large sd cards." into idea133 automerge: b554f97Xavier Ducrohet2014-06-191-0/+4
|\ \ \ | |/ /
| * | Merge "Enable large sd cards." into idea133Xavier Ducrohet2014-06-191-0/+4
| |\ \ | | |/
| | * Merge "Enable large sd cards." into idea133Xavier Ducrohet2014-06-171-0/+4
| | |\
| | | * Enable large sd cards.Xavier Ducrohet2014-06-191-0/+4
| | |/
* | | am 57d14693: Merge "fix AVD Manager name." into idea133 automerge: 306af44Xavier Ducrohet2014-06-191-1/+1
|\ \ \ | |/ /
| * | Merge "fix AVD Manager name." into idea133Xavier Ducrohet2014-06-191-1/+1
| |\ \ | | |/
| | * Merge "fix AVD Manager name." into idea133Xavier Ducrohet2014-06-181-1/+1
| | |\
| | | * fix AVD Manager name.Xavier Ducrohet2014-06-181-1/+1
* | | | am 3ff68051: Merge "Fix find_java." into idea133 automerge: 1b20fb2Xavier Ducrohet2014-06-192-0/+40
|\ \ \ \ | |/ / /
| * | | Merge "Fix find_java." into idea133Xavier Ducrohet2014-06-192-0/+40
| |\ \ \ | | |/ /
| | * | Merge "Fix find_java." into idea133Xavier Ducrohet2014-06-171-0/+6
| | |\ \
| | | * | Fix find_java.Xavier Ducrohet2014-06-181-0/+6
| | | |/
| | * | Merge "monitor: Remove unnecessary plugins during release" into idea133Siva Velusamy2014-06-181-0/+34
| | |\ \ | | | |/ | | |/|
| | | * monitor: Remove unnecessary plugins during releaseSiva Velusamy2014-06-181-0/+34
* | | | am 064ccc8b: Merge "Fix packagign of sdk launcher exe on win." into idea133 a...Xavier Ducrohet2014-06-1958-88/+170
|\ \ \ \ | |/ / /
| * | | Merge "Fix packagign of sdk launcher exe on win." into idea133Xavier Ducrohet2014-06-1958-88/+170
| |\ \ \ | | |/ /
| | * | Merge "Fix packagign of sdk launcher exe on win." into idea133Xavier Ducrohet2014-06-171-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Fix packagign of sdk launcher exe on win.Xavier Ducrohet2014-06-181-1/+1
| | |/
| | * Merge "Make zipAlignExe come from Build-tools" into idea133Xavier Ducrohet2014-06-172-1/+5
| | |\
| | | * Make zipAlignExe come from Build-toolsXavier Ducrohet2014-06-172-1/+5
| | |/
| | * Merge "Add monitor to sdk build" into idea133Siva Velusamy2014-06-172-2/+80
| | |\
| | | * Add monitor to sdk buildSiva Velusamy2014-06-172-2/+80
| | * | Merge "Update ADT plugins/features version to 23.0.0" into idea133Xavier Ducrohet2014-06-1752-83/+83
| | |\ \ | | | |/
| | | * Update ADT plugins/features version to 23.0.0Siva Velusamy2014-06-1752-83/+83
| | * | Merge "Update Tools package revision to 23.0.0" into idea133Xavier Ducrohet2014-06-171-1/+1
| | |\ \ | | | |/
| | | * Update Tools package revision to 23.0.0Siva Velusamy2014-06-171-1/+1
| | |/
* | | am aaecc136: Merge "AVD/SDK Launchers win build." into idea133 automerge: c86...Xavier Ducrohet2014-06-196-2/+74
|\ \ \ | |/ /
| * | Merge "AVD/SDK Launchers win build." into idea133Xavier Ducrohet2014-06-196-2/+74
| |\ \ | | |/
| | * Merge "AVD/SDK Launchers win build." into idea133Xavier Ducrohet2014-06-176-2/+74
| | |\
| | | * AVD/SDK Launchers win build.Xavier Ducrohet2014-06-176-2/+74
| | |/
* | | am 8a045a2b: Merge "Compile find_java with Gradle." into idea133 automerge: e...Xavier Ducrohet2014-06-176-0/+35
|\ \ \ | |/ /
| * | Merge "Compile find_java with Gradle." into idea133Xavier Ducrohet2014-06-176-0/+35
| |\ \ | | |/
| | * Merge "Compile find_java with Gradle." into idea133Xavier Ducrohet2014-06-166-0/+35
| | |\
| | | * Compile find_java with Gradle.Xavier Ducrohet2014-06-116-0/+35
* | | | am 20254048: Merge changes Ib3d44914,Id8cd09ed,Ib315de96 into idea133 automer...Siva Velusamy2014-06-177-114/+10
|\ \ \ \ | |/ / /
| * | | Merge changes Ib3d44914,Id8cd09ed,Ib315de96 into idea133Siva Velusamy2014-06-177-114/+10
| |\ \ \ | | |/ /
| | * | Merge changes Ib3d44914,Id8cd09ed,Ib315de96 into idea133Siva Velusamy2014-06-127-114/+10
| | |\ \
| | | * | monitor product: Increase default heap sizeSiva Velusamy2014-06-152-2/+5
| | | * | Remove unneeded dependencies from traceview feature.xmlSiva Velusamy2014-06-153-5/+5
| | | * | Remove obsolete .product filesSiva Velusamy2014-06-153-107/+0
| | |/ /
* | | | am 4696211b: Merge "Fix build script: no more .tar.gz files for adt bundles" ...Siva Velusamy2014-06-171-1/+0
|\ \ \ \ | |/ / /
| * | | Merge "Fix build script: no more .tar.gz files for adt bundles" into idea133Siva Velusamy2014-06-171-1/+0
| |\ \ \ | | |/ /
| | * | Merge "Fix build script: no more .tar.gz files for adt bundles" into idea133Siva Velusamy2014-06-121-1/+0
| | |\ \
| | | * | Fix build script: no more .tar.gz files for adt bundlesSiva Velusamy2014-06-131-1/+0
* | | | | am d59e33d1: Merge "eclipse tycho: Bundle artifacts as zips on all platforms"...Siva Velusamy2014-06-171-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "eclipse tycho: Bundle artifacts as zips on all platforms" into idea133Siva Velusamy2014-06-171-2/+2
| |\ \ \ \ | | |/ / /