Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update SDK Tools version to 22.6 | Xavier Ducrohet | 2014-01-15 | 1 | -1/+1 |
* | Merge "Update ADT version to 22.6" into idea133 | Xavier Ducrohet | 2014-01-15 | 27 | -45/+45 |
|\ | |||||
| * | Update ADT version to 22.6 | Xavier Ducrohet | 2014-01-15 | 27 | -45/+45 |
|/ | |||||
* | Merge "Always change markers in a job when initializing classpath." into idea133 | Xavier Ducrohet | 2014-01-15 | 1 | -56/+41 |
|\ | |||||
| * | Always change markers in a job when initializing classpath. | Xavier Ducrohet | 2014-01-14 | 1 | -56/+41 |
|/ | |||||
* | Merge "Fix manual copy of lombok in the tools." into idea133 | Tor Norbye | 2014-01-04 | 1 | -4/+1 |
|\ | |||||
| * | Fix manual copy of lombok in the tools. | Xavier Ducrohet | 2014-01-03 | 1 | -4/+1 |
* | | Merge "Update to Lombok 0.2.2 and package ecj for command line lint" into ide... | Tor Norbye | 2014-01-04 | 8 | -15/+14 |
|\ \ | |/ |/| | |||||
| * | Update to Lombok 0.2.2 and package ecj for command line lint | Tor Norbye | 2014-01-03 | 8 | -15/+14 |
|/ | |||||
* | Merge "Track API change" into idea133 | Tor Norbye | 2013-12-30 | 1 | -2/+2 |
|\ | |||||
| * | Track API change | Tor Norbye | 2013-12-30 | 1 | -2/+2 |
|/ | |||||
* | Merge "Update deprecated API usage" into idea133 | Tor Norbye | 2013-12-30 | 2 | -6/+6 |
|\ | |||||
| * | Update deprecated API usage | Tor Norbye | 2013-12-26 | 2 | -6/+6 |
|/ | |||||
* | Merge "Allow project callback to append warnings to IDE log" into idea133 | Tor Norbye | 2013-12-21 | 1 | -3/+15 |
|\ | |||||
| * | Allow project callback to append warnings to IDE log | Tor Norbye | 2013-12-20 | 1 | -3/+15 |
|/ | |||||
* | Merge "Update from Guava 13.0.1 to Guava 15" into idea133 | Tor Norbye | 2013-12-20 | 3 | -3/+3 |
|\ | |||||
| * | Update from Guava 13.0.1 to Guava 15 | Tor Norbye | 2013-12-20 | 3 | -3/+3 |
|/ | |||||
* | Merge "Use SdkVersionInfo#getAndroidName instead of local table" into idea133 | Tor Norbye | 2013-12-20 | 1 | -37/+15 |
|\ | |||||
| * | Use SdkVersionInfo#getAndroidName instead of local table | Tor Norbye | 2013-12-18 | 1 | -37/+15 |
* | | Merge "Allow control over whether Device Chooser Dialog is displayed" into id... | Siva Velusamy | 2013-12-19 | 7 | -138/+149 |
|\ \ | |/ |/| | |||||
| * | Allow control over whether Device Chooser Dialog is displayed | Siva Velusamy | 2013-12-19 | 7 | -138/+149 |
|/ | |||||
* | Merge "Remove security manager warning" into idea133 | Tor Norbye | 2013-12-16 | 1 | -1/+0 |
|\ | |||||
| * | Remove security manager warning | Tor Norbye | 2013-12-16 | 1 | -1/+0 |
|/ | |||||
* | Merge commit '272f943f735fe90ec4069d6c3e9338c947364045' into HEAD | The Android Open Source Project | 2013-12-05 | 0 | -0/+0 |
|\ | |||||
| * | am 223f27f9: Merge "Fix ADT grid layout editor support in KitKat" | Tor Norbye | 2013-11-15 | 1 | -2/+10 |
| |\ | |||||
| * \ | am ee7f6ece: Merge "Delete buffer data when removing it from the SharedGroup ... | Jesse Hall | 2013-11-12 | 1 | -14/+36 |
| |\ \ | |||||
| * \ \ | am 5b817558: Merge changes I0cccba67,I4cf8a19b | Xavier Ducrohet | 2013-11-07 | 1 | -2/+3 |
| |\ \ \ | |||||
| * \ \ \ | am 01b06e3b: Merge "53653: Eclipse: 100% CPU usage in ADT pattern matching code" | Tor Norbye | 2013-11-06 | 2 | -19/+43 |
| |\ \ \ \ | |||||
| * \ \ \ \ | am 67b0445d: Merge "Support KitKat language features in ADT" | Tor Norbye | 2013-11-05 | 2 | -8/+58 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | am 9e02007b: Merge "Fixed ADT plugin bug while import existing project" | Siva Velusamy | 2013-10-21 | 1 | -1/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | am 8cde8cff: Merge "Fix target parser" | Tor Norbye | 2013-10-17 | 1 | -1/+10 |
| |\ \ \ \ \ \ \ | |||||
* | \ \ \ \ \ \ \ | Merge "Force building some gradle artifact with assemble." | Xavier Ducrohet | 2013-12-05 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Force building some gradle artifact with assemble. | Xavier Ducrohet | 2013-12-05 | 1 | -2/+2 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge "Pass credentials to render sandbox" | Tor Norbye | 2013-11-27 | 7 | -37/+93 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Pass credentials to render sandbox | Tor Norbye | 2013-11-27 | 7 | -37/+93 |
|/ / / / / / / / / | |||||
* | | | | | | | | | Merge "Allow writing exceptions to the ADT log during rendering" | Tor Norbye | 2013-11-26 | 1 | -4/+27 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Allow writing exceptions to the ADT log during rendering | Tor Norbye | 2013-11-25 | 1 | -4/+27 |
* | | | | | | | | | | Merge commit '98d18c71cee74e23f2aac3b1c3df5ad81f3a624b' into HEAD | The Android Open Source Project | 2013-11-22 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | am a14e8547: Merge "Switch ADT to 22.3.0 (fix build)" | Raphael Moll | 2013-10-14 | 28 | -39/+46 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | am f62da4db: Merge "Switch ADT to version 22.3" | Raphael Moll | 2013-10-14 | 28 | -54/+79 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | am 1343e0d0: Merge "Switch version to Tools 22.3" | Raphael Moll | 2013-10-14 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | am 752bda63: Merge "Increase perm size in default ADT Bundle" | Siva Velusamy | 2013-10-07 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | am acbf16e0: Merge "Use the new ResourceUrl API in sdk-common" | Tor Norbye | 2013-09-23 | 7 | -63/+68 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 9aeefbc7: Merge "Update changes.txt" | Raphael Moll | 2013-09-19 | 1 | -0/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6e3ada8e: Merge "ADT requires Tools 22.2.1" | Raphael Moll | 2013-09-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 68b27100: Merge "Switch ADT to version 22.2.1" | Raphael Moll | 2013-09-18 | 28 | -40/+45 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6d42175b: Merge "Switch to Tools 22.2.1" | Raphael Moll | 2013-09-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 6e97b999: Merge "Rename lombok.jar in tools/lib to match what lint.jar exp... | Tor Norbye | 2013-09-17 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am c30bc752: Merge "Update min-platform-tools from 16 to 18." | Raphael Moll | 2013-09-13 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 2c6fcd8a: Merge "Update path to studio build script" | Siva Velusamy | 2013-09-13 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |