aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Update ADT to version 24.0.1" into studio-1.0-dev automerge: d3f8c81 a...android-wear-5.0.0_r1lollipop-wear-releaseTor Norbye2014-12-110-0/+0
|\
| * Merge "Update ADT to version 24.0.1" into studio-1.0-dev automerge: d3f8c81Tor Norbye2014-12-110-0/+0
| |\
| | * Merge "Update ADT to version 24.0.1" into studio-1.0-devTor Norbye2014-12-110-0/+0
| | |\
| | | * Merge "Update ADT to version 24.0.1" into studio-1.0-devTor Norbye2014-12-1053-77/+77
| | | |\
| | | | * Update ADT to version 24.0.1Tor Norbye2014-12-1053-77/+77
| | | |/
* | | | Merge "Update SDK Tools to 24.0.1" into studio-1.0-dev automerge: 7cf8c6e aut...Xavier Ducrohet2014-12-111-1/+1
|\| | |
| * | | Merge "Update SDK Tools to 24.0.1" into studio-1.0-dev automerge: 7cf8c6eXavier Ducrohet2014-12-111-1/+1
| |\| |
| | * | Merge "Update SDK Tools to 24.0.1" into studio-1.0-devXavier Ducrohet2014-12-111-1/+1
| | |\|
| | | * Merge "Update SDK Tools to 24.0.1" into studio-1.0-devXavier Ducrohet2014-12-101-1/+1
| | | |\
| | | | * Update SDK Tools to 24.0.1Xavier Ducrohet2014-12-091-1/+1
* | | | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.0-dev a...David Herman2014-12-110-0/+0
|\| | | |
| * | | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.0-dev a...David Herman2014-12-110-0/+0
| |\| | |
| | * | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.0-devDavid Herman2014-12-110-0/+0
| | |\| |
| | | * | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.0-devDavid Herman2014-12-101-1/+1
| | | |\ \ | | | | |/ | | | |/|
| | | | * Fixed find_java syntax error on 32-bit machinesDavid Herman2014-12-101-1/+1
| | | |/
* | | | Merge "Update ADT to version 24.0.1" into studio-1.1-dev automerge: b9e8a9eTor Norbye2014-12-1153-77/+77
|\| | |
| * | | Merge "Update ADT to version 24.0.1" into studio-1.1-devTor Norbye2014-12-1053-77/+77
| |\| |
| | * | Merge "Update ADT to version 24.0.1" into studio-1.1-devTor Norbye2014-12-1053-77/+77
| | |\ \
| | | * | Update ADT to version 24.0.1Tor Norbye2014-12-1053-77/+77
| | |/ /
* | | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.1-dev a...David Herman2014-12-101-1/+1
|\| | |
| * | | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.1-devDavid Herman2014-12-101-1/+1
| |\| |
| | * | Merge "Fixed find_java syntax error on 32-bit machines" into studio-1.1-devDavid Herman2014-12-101-1/+1
| | |\ \ | | | |/ | | |/|
| | | * Fixed find_java syntax error on 32-bit machinesDavid Herman2014-12-091-1/+1
| | |/
* | | Merge "emulator/opengl: Remove obsolete directory."David 'Digit' Turner2014-12-08260-43724/+2
|\ \ \
| * | | emulator/opengl: Remove obsolete directory.David 'Digit' Turner2014-12-08260-43724/+2
* | | | Merge "Update ADT version to 24.0.0." into studio-1.0-dev automerge: 4826e23Tor Norbye2014-12-0353-77/+77
|\ \ \ \ | | |/ / | |/| |
| * | | Merge "Update ADT version to 24.0.0." into studio-1.0-devTor Norbye2014-12-0353-77/+77
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Update ADT version to 24.0.0." into studio-1.0-devTor Norbye2014-12-0353-77/+77
| | |\ \
| | | * | Update ADT version to 24.0.0.Tor Norbye2014-12-0353-77/+77
* | | | | Merge "Update SDK tools version to 24.0.0." into studio-1.0-dev automerge: e3...Tor Norbye2014-12-031-1/+1
|\| | | | | |_|_|/ |/| | |
| * | | Merge "Update SDK tools version to 24.0.0." into studio-1.0-devTor Norbye2014-12-031-1/+1
| |\| |
| | * | Merge "Update SDK tools version to 24.0.0." into studio-1.0-devTor Norbye2014-12-031-1/+1
| | |\|
| | | * Update SDK tools version to 24.0.0.Tor Norbye2014-12-031-1/+1
| | |/
* | | Merge "80481: Update Gradle Export from Eclipse to handle 1.0" into studio-1....Tor Norbye2014-12-023-7/+8
|\| |
| * | Merge "80481: Update Gradle Export from Eclipse to handle 1.0" into studio-1....Tor Norbye2014-12-023-7/+8
| |\|
| | * Merge "80481: Update Gradle Export from Eclipse to handle 1.0" into studio-1....Tor Norbye2014-12-023-7/+8
| | |\
| | | * 80481: Update Gradle Export from Eclipse to handle 1.0Tor Norbye2014-12-023-7/+8
| | |/
* | | Merge "Update ADT version to 23.0.6" into studio-1.0-dev automerge: e3ce02cTor Norbye2014-12-0253-77/+77
|\| |
| * | Merge "Update ADT version to 23.0.6" into studio-1.0-devTor Norbye2014-12-0253-77/+77
| |\|
| | * Merge "Update ADT version to 23.0.6" into studio-1.0-devTor Norbye2014-12-0253-77/+77
| | |\
| | | * Update ADT version to 23.0.6Tor Norbye2014-11-2653-77/+77
* | | | Merge "72760: Lint errors prevent exporting of application" into studio-1.0-d...Tor Norbye2014-12-017-11/+78
|\| | |
| * | | Merge "72760: Lint errors prevent exporting of application" into studio-1.0-devTor Norbye2014-12-017-11/+78
| |\| |
| | * | Merge "72760: Lint errors prevent exporting of application" into studio-1.0-devTor Norbye2014-12-017-11/+78
| | |\|
| | | * 72760: Lint errors prevent exporting of applicationTor Norbye2014-11-267-11/+78
| | |/
* | | Merge "emulator/opengl: Fix Windows cross-build."David 'Digit' Turner2014-12-011-1/+1
|\ \ \
| * | | emulator/opengl: Fix Windows cross-build.David 'Digit' Turner2014-12-011-1/+1
|/ / /
* | | Merge changes I58865946,I582d5ab6,Ib1b6bcbaDavid 'Digit' Turner2014-11-2832-112/+514
|\ \ \
| * | | emulator/opengl: Fix pixelDataSize() ambiguity.David 'Digit' Turner2014-11-282-11/+11
| * | | emulator/opengl: Update declarations to fix const issue.David 'Digit' Turner2014-11-286-8/+10