aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Update SDK Tools version to 22.6Xavier Ducrohet2014-01-151-1/+1
* Merge "Update ADT version to 22.6" into idea133Xavier Ducrohet2014-01-1527-45/+45
|\
| * Update ADT version to 22.6Xavier Ducrohet2014-01-1527-45/+45
|/
* Merge "Always change markers in a job when initializing classpath." into idea133Xavier Ducrohet2014-01-151-56/+41
|\
| * Always change markers in a job when initializing classpath.Xavier Ducrohet2014-01-141-56/+41
|/
* Merge "Fix manual copy of lombok in the tools." into idea133Tor Norbye2014-01-041-4/+1
|\
| * Fix manual copy of lombok in the tools.Xavier Ducrohet2014-01-031-4/+1
* | Merge "Update to Lombok 0.2.2 and package ecj for command line lint" into ide...Tor Norbye2014-01-048-15/+14
|\ \ | |/ |/|
| * Update to Lombok 0.2.2 and package ecj for command line lintTor Norbye2014-01-038-15/+14
|/
* Merge "Track API change" into idea133Tor Norbye2013-12-301-2/+2
|\
| * Track API changeTor Norbye2013-12-301-2/+2
|/
* Merge "Update deprecated API usage" into idea133Tor Norbye2013-12-302-6/+6
|\
| * Update deprecated API usageTor Norbye2013-12-262-6/+6
|/
* Merge "Allow project callback to append warnings to IDE log" into idea133Tor Norbye2013-12-211-3/+15
|\
| * Allow project callback to append warnings to IDE logTor Norbye2013-12-201-3/+15
|/
* Merge "Update from Guava 13.0.1 to Guava 15" into idea133Tor Norbye2013-12-203-3/+3
|\
| * Update from Guava 13.0.1 to Guava 15Tor Norbye2013-12-203-3/+3
|/
* Merge "Use SdkVersionInfo#getAndroidName instead of local table" into idea133Tor Norbye2013-12-201-37/+15
|\
| * Use SdkVersionInfo#getAndroidName instead of local tableTor Norbye2013-12-181-37/+15
* | Merge "Allow control over whether Device Chooser Dialog is displayed" into id...Siva Velusamy2013-12-197-138/+149
|\ \ | |/ |/|
| * Allow control over whether Device Chooser Dialog is displayedSiva Velusamy2013-12-197-138/+149
|/
* Merge "Remove security manager warning" into idea133Tor Norbye2013-12-161-1/+0
|\
| * Remove security manager warningTor Norbye2013-12-161-1/+0
|/
* Merge commit '272f943f735fe90ec4069d6c3e9338c947364045' into HEADThe Android Open Source Project2013-12-050-0/+0
|\
| * am 223f27f9: Merge "Fix ADT grid layout editor support in KitKat"Tor Norbye2013-11-151-2/+10
| |\
| * \ am ee7f6ece: Merge "Delete buffer data when removing it from the SharedGroup ...Jesse Hall2013-11-121-14/+36
| |\ \
| * \ \ am 5b817558: Merge changes I0cccba67,I4cf8a19bXavier Ducrohet2013-11-071-2/+3
| |\ \ \
| * \ \ \ am 01b06e3b: Merge "53653: Eclipse: 100% CPU usage in ADT pattern matching code"Tor Norbye2013-11-062-19/+43
| |\ \ \ \
| * \ \ \ \ am 67b0445d: Merge "Support KitKat language features in ADT"Tor Norbye2013-11-052-8/+58
| |\ \ \ \ \
| * \ \ \ \ \ am 9e02007b: Merge "Fixed ADT plugin bug while import existing project"Siva Velusamy2013-10-211-1/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am 8cde8cff: Merge "Fix target parser"Tor Norbye2013-10-171-1/+10
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge "Force building some gradle artifact with assemble."Xavier Ducrohet2013-12-051-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Force building some gradle artifact with assemble.Xavier Ducrohet2013-12-051-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge "Pass credentials to render sandbox"Tor Norbye2013-11-277-37/+93
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass credentials to render sandboxTor Norbye2013-11-277-37/+93
|/ / / / / / / / /
* | | | | | | | | Merge "Allow writing exceptions to the ADT log during rendering"Tor Norbye2013-11-261-4/+27
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow writing exceptions to the ADT log during renderingTor Norbye2013-11-251-4/+27
* | | | | | | | | | Merge commit '98d18c71cee74e23f2aac3b1c3df5ad81f3a624b' into HEADThe Android Open Source Project2013-11-220-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am a14e8547: Merge "Switch ADT to 22.3.0 (fix build)"Raphael Moll2013-10-1428-39/+46
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am f62da4db: Merge "Switch ADT to version 22.3"Raphael Moll2013-10-1428-54/+79
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 1343e0d0: Merge "Switch version to Tools 22.3"Raphael Moll2013-10-141-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ am 752bda63: Merge "Increase perm size in default ADT Bundle"Siva Velusamy2013-10-071-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am acbf16e0: Merge "Use the new ResourceUrl API in sdk-common"Tor Norbye2013-09-237-63/+68
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 9aeefbc7: Merge "Update changes.txt"Raphael Moll2013-09-191-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6e3ada8e: Merge "ADT requires Tools 22.2.1"Raphael Moll2013-09-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 68b27100: Merge "Switch ADT to version 22.2.1"Raphael Moll2013-09-1828-40/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6d42175b: Merge "Switch to Tools 22.2.1"Raphael Moll2013-09-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 6e97b999: Merge "Rename lombok.jar in tools/lib to match what lint.jar exp...Tor Norbye2013-09-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c30bc752: Merge "Update min-platform-tools from 16 to 18."Raphael Moll2013-09-131-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 2c6fcd8a: Merge "Update path to studio build script"Siva Velusamy2013-09-131-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \