summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2014-07-16Merge "72680: Handle Studio settings upgrades more automatically"Tor Norbye
2014-07-1672680: Handle Studio settings upgrades more automaticallyTor Norbye
2014-06-18Merge "Updated dependency to Android Gradle plug-in 0.12.0."android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releaseAlex Ruiz
2014-06-18Updated dependency to Android Gradle plug-in 0.12.0.Alex Ruiz
2014-06-16Merge "Warn if using Open JDK."Tor Norbye
2014-06-16Warn if using Open JDK.Siva Velusamy
2014-06-10Snapshot idea/138.538 from git://git.jetbrains.org/idea/community.gitTor Norbye
2014-06-10Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"Tor Norbye
2014-06-10Merge remote-tracking branch 'aosp/upstream-master' into mergeTor Norbye
2014-05-29Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"Tor Norbye
2014-05-28Merge remote-tracking branch 'aosp/upstream-master' into mergeTor Norbye
2014-05-28Snapshot idea/138.343 from git://git.jetbrains.org/idea/community.gitTor Norbye
2014-05-28Merge "Update builder model prebuilt."Tor Norbye
2014-05-28Update builder model prebuilt.Xavier Ducrohet
2014-05-28Merge "Added output folders to ModuleExtendedModel."Tor Norbye
2014-05-28Added output folders to ModuleExtendedModel.Alex Ruiz
2014-05-28Merge "ExtendedBuildModel now exposes the project's build directory."Tor Norbye
2014-05-28ExtendedBuildModel now exposes the project's build directory.Alex Ruiz
2014-05-20Merge "Script to build studio to be called by build server"Siva Velusamy
2014-05-20Script to build studio to be called by build serverSiva Velusamy
2014-05-20Merge "Fix path to freemarker in build script."Siva Velusamy
2014-05-20Fix path to freemarker in build script.Siva Velusamy
2014-05-20Merge "Update path to mockito"Siva Velusamy
2014-05-20Update path to mockitoSiva Velusamy
2014-05-16Merge "Upgrade freemarker: 2.3.19 -> 2.3.20"Siva Velusamy
2014-05-16Upgrade freemarker: 2.3.19 -> 2.3.20Siva Velusamy
2014-05-13Merge "Merge RenameDialog API change"Tor Norbye
2014-05-13Merge RenameDialog API changeTor Norbye
2014-05-07Merge "Update for idea/135.815 android plugin merge"Tor Norbye
2014-05-06Update for idea/135.815 android plugin mergeTor Norbye
2014-04-30Merge "Don't enable debugging during build"Siva Velusamy
2014-04-30Don't enable debugging during buildSiva Velusamy
2014-04-29Merge "Update tools/idea project to build with builder model 0.10"Tor Norbye
2014-04-29Update tools/idea project to build with builder model 0.10Tor Norbye
2014-04-29Merge "Don't enable debugging on JVM running tests"Siva Velusamy
2014-04-29Don't enable debugging on JVM running testsSiva Velusamy
2014-04-25Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"Tor Norbye
2014-04-25Merge remote-tracking branch 'aosp/upstream-master' into mergeTor Norbye
2014-04-25Snapshot idea/136.1761 from git://git.jetbrains.org/idea/community.gitTor Norbye
2014-04-22Merge "Include .ico file in Linux distro"Tor Norbye
2014-04-22Include .ico file in Linux distroSiva Velusamy
2014-04-17Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"Tor Norbye
2014-04-17Merge remote-tracking branch 'aosp/upstream-master' into mergeTor Norbye
2014-04-17Snapshot 117b3dbedca758fa08dd37d4a36cf4a2320fae03 from idea/136.1685 of git:/...Tor Norbye
2014-04-10Snapshot 1fff8e2b7bbcfdea262d3782d4307ca6437da2a3 from idea/136.1153 of git:/...Tor Norbye
2014-04-04Merge "Remove unused cloud tools templates"Siva Velusamy
2014-04-04Remove unused cloud tools templatesAppu Goundan
2014-03-11Merge "Add mockito to user libraries (used by the manifest merger module's te...Siva Velusamy
2014-03-11Add mockito to user libraries (used by the manifest merger module's tests)Tor Norbye
2014-03-10Merge "Merge remote-tracking branch 'aosp/snapshot-master' into merge"Tor Norbye