aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7153cf37: Merge "build_server.sh: fix QUALIFIER name."Raphaël Moll2013-09-121-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 372568af: Merge "Track API change in tools/base"Tor Norbye2013-09-101-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3012ebca: Merge "Reverting incorrect change"Josiah Gaskin2013-09-091-5/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f192e65a: Merge "ADT ignores new template dependencies"Josiah Gaskin2013-09-092-1/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 59cd3677: Merge "Correctly parse ldrtl qualifier."Deepanshu Gupta2013-09-051-0/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3b7f07a7: Merge "Fix layout preview for RTL locales"Deepanshu Gupta2013-09-053-1/+41
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ba84fc0a: Merge "Update tools/ADT revision."Xavier Ducrohet2013-09-0328-46/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c9162374: Merge "Update traceview for ddmlib API change"Siva Velusamy2013-08-301-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cd90cc17: Merge "Remove bouncycastle dependency."Xavier Ducrohet2013-08-292-5/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am c681a244: Merge "RS Support mode in ADT."Xavier Ducrohet2013-08-2820-841/+828
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 86de8a91: Don\'t recursively make when calling create_all_symlinks.sh from...Ying Wang2013-08-270-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't recursively make when calling create_all_symlinks.sh from a makefile.Ying Wang2013-08-263-20/+20
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a2af1185: Merge "Don\'t recursively make when calling create_all_symlinks....Ying Wang2013-08-233-20/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4ce884fc: Merge "Fix issue with gradle export."Xavier Ducrohet2013-08-211-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c9cde6d: Merge "Support for installing SDK in C:\Program Files"Scott Barta2013-08-204-18/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2025-03-13 22:10:56 +0000