aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "pixel perfect: Disable controls" into studio-1.1-dev automerge: b234933Tor Norbye2015-02-051-3/+5
|\
| * Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-051-3/+5
| |\
| | * Merge "pixel perfect: Disable controls" into studio-1.1-devTor Norbye2015-02-031-3/+5
| | |\
| | | * pixel perfect: Disable controlsSiva Velusamy2015-02-031-3/+5
| | |/
* | | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into studio-1...Tor Norbye2015-02-0516-452/+439
|\ \ \ | |/ /
| * | Merge "Update Eclipse plugin to handle new LocaleQualifier API" into studio-1...Tor Norbye2015-02-0416-452/+439
| |\ \
| | * | Update Eclipse plugin to handle new LocaleQualifier APITor Norbye2015-02-0416-452/+439
| |/ /
* | | Merge "Remove stale scripts" into studio-1.2-devSiva Velusamy2015-02-0312-1493/+0
|\ \ \ | |/ /
| * | Merge "Remove stale scripts" into studio-1.2-devSiva Velusamy2015-02-0312-1493/+0
| |\ \
| | * | Remove stale scriptsSiva Velusamy2015-02-0312-1493/+0
* | | | Merge "Add AssetRepository to render params." into studio-1.1-dev automerge: ...Tor Norbye2015-01-290-0/+0
|\ \ \ \ | |/ / /
| * | | Merge "Add AssetRepository to render params." into studio-1.1-devTor Norbye2015-01-290-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Add AssetRepository to render params." into studio-1.1-devTor Norbye2015-01-291-0/+4
| | |\ \ | | | |/ | | |/|
| | | * Add AssetRepository to render params.Deepanshu Gupta2015-01-281-0/+4
| | |/
* | | Merge "Add AssetRepository to render params." into studio-1.2-devDeepanshu Gupta2015-01-281-0/+4
|\ \ \ | |/ /
| * | Merge "Add AssetRepository to render params." into studio-1.2-devDeepanshu Gupta2015-01-281-0/+4
| |\ \ | | |/ | |/|
| | * Add AssetRepository to render params.Deepanshu Gupta2015-01-281-0/+4
* | | Merge "Track LocaleManager API changes" into studio-1.1-devTor Norbye2015-01-282-3/+4
|\ \ \ | |/ /
| * | Merge "Track LocaleManager API changes" into studio-1.1-devTor Norbye2015-01-272-3/+4
| |\ \ | | |/ | |/|
| | * Track LocaleManager API changesTor Norbye2015-01-272-3/+4
| |/
* | Merge changes I87b5b309,Id23d941c into studio-1.1-devSiva Velusamy2015-01-143-211/+1
|\ \ | |/
| * Merge changes I87b5b309,Id23d941c into studio-1.1-devSiva Velusamy2015-01-143-211/+1
| |\
| | * Update adt plugin's manifest to use lombok 0.2.3Siva Velusamy2015-01-141-1/+1
| | * Remove obsolete p2gen folderSiva Velusamy2015-01-142-210/+0
| |/
* | Merge "Update Eclipse POM" into studio-1.1-devTor Norbye2015-01-131-1/+1
|\ \ | |/
| * Merge "Update Eclipse POM" into studio-1.1-devTor Norbye2015-01-131-1/+1
| |\
| | * Update Eclipse POMTor Norbye2015-01-131-1/+1
| |/
* | Merge commit '3c8eb96ce2491b52cb181295e0481ec593777e0c' into studio-master-devThe Android Automerger2015-01-122-2/+2
|\ \ | |/
| * Merge "Use Lombok 0.2.3 for ADT plugin" into studio-1.1-devTor Norbye2015-01-072-2/+2
| |\
| | * Use Lombok 0.2.3 for ADT pluginTor Norbye2015-01-072-2/+2
| |/
* | Merge "Update ADT with ASM 5.0.3" into studio-1.1-devTor Norbye2014-12-216-16/+16
|\ \ | |/
| * Merge "Update ADT with ASM 5.0.3" into studio-1.1-devTor Norbye2014-12-206-16/+16
| |\
| | * Update ADT with ASM 5.0.3Tor Norbye2014-12-196-16/+16
| |/
* | Merge "find_java.bat now uses env var instead of find" into studio-1.0-dev au...David Herman2014-12-170-0/+0
|\ \ | |/
| * Merge "find_java.bat now uses env var instead of find" into studio-1.0-devDavid Herman2014-12-170-0/+0
| |\
| | * Merge "find_java.bat now uses env var instead of find" into studio-1.0-devDavid Herman2014-12-151-3/+15
| | |\
| | | * find_java.bat now uses env var instead of findDavid Herman2014-12-151-3/+15
| | |/
* | | Merge "Minor improvements to systrace options dialog" into studio-1.1-devSiva Velusamy2014-12-171-24/+57
|\ \ \ | |/ /
| * | Merge "Minor improvements to systrace options dialog" into studio-1.1-devSiva Velusamy2014-12-171-24/+57
| |\ \
| | * | Minor improvements to systrace options dialogSiva Velusamy2014-12-161-24/+57
| |/ /
* | | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-dev automerge: e99a450Tor Norbye2014-12-160-0/+0
|\ \ \ | |/ /
| * | Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-devTor Norbye2014-12-160-0/+0
| |\ \ | | |/
| | * Merge "Update ADT & SDK Tools to 24.0.2" into studio-1.0-devTor Norbye2014-12-1555-79/+79
| | |\
| | | * Update ADT & SDK Tools to 24.0.2Tor Norbye2014-12-1555-79/+79
| | |/
* | | Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-dev...Tor Norbye2014-12-164-169/+3
|\ \ \ | |/ /
| * | Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-devTor Norbye2014-12-164-169/+3
| |\ \ | | |/
| | * Merge "Revert "82393: Fix template instantiation in ADT"" into studio-1.0-devTor Norbye2014-12-154-169/+3
| | |\
| | | * Revert "82393: Fix template instantiation in ADT"Tor Norbye2014-12-154-169/+3
| | |/
* | | Merge "82393: Fix template instantiation in ADT" into studio-1.0-dev automerg...Tor Norbye2014-12-164-3/+169
|\ \ \ | |/ /
| * | Merge "82393: Fix template instantiation in ADT" into studio-1.0-devTor Norbye2014-12-164-3/+169
| |\ \ | | |/
generated by cgit v1.1 at 2024-12-23 13:23:38 +0000