aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseXin Li2019-10-300-0/+0
|\
| * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-4android-r-preview-3android-r-preview-2Xin Li2019-10-300-0/+0
| |\
| | * DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-m...android-r-preview-1Xin Li2019-10-300-0/+0
| | |\ | | |/ | |/|
* | | add license and metadata info am: 03b0ed0273 am: 23b23b72c6 am: 450313a704Steve Elliott2019-09-064-0/+215
|\| |
| * | add license and metadata info am: 03b0ed0273 am: 23b23b72c6Steve Elliott2019-09-064-0/+215
| |\ \
| | * | add license and metadata info am: 03b0ed0273Steve Elliott2019-09-064-0/+215
| | |\|
| | | * add license and metadata infoSteve Elliott2019-09-064-0/+215
| | | |\
| | | | * add license and metadata infoplatform-tools-29.0.5ndk-sysroot-r21Steve Elliott2019-09-064-0/+215
* | | | | Merge remote-tracking branch 'aosp/upstream-master' into master am: 555408c0d...Steve Elliott2019-09-061040-0/+95642
|\| | | |
| * | | | Merge remote-tracking branch 'aosp/upstream-master' into master am: 555408c0d...Steve Elliott2019-09-061040-0/+95642
|/| | | | | |/ / /
| * / / Merge remote-tracking branch 'aosp/upstream-master' into master am: 555408c0d3Steve Elliott2019-09-061040-0/+95642
|/| | | | |/ /
| * / Merge remote-tracking branch 'aosp/upstream-master' into masterSteve Elliott2019-09-061040-0/+95642
|/| | | |/
| * Merge remote-tracking branch 'aosp/upstream-master' into masterSteve Elliott2019-09-061040-0/+95642
|/|
| * Fixed site publication in build scriptRoman Elizarov2019-09-041-2/+2
| * Version 1.3.1Roman Elizarov2019-09-049-17/+30
| * Gradle version 5.6.1Roman Elizarov2019-09-0411-184/+131
| * Check for -PstressTest=true to run "long" stress testRoman Elizarov2019-09-041-2/+2
| * Merge remote-tracking branch 'origin/master' into developRoman Elizarov2019-09-041-4/+4
| |\
| | * Flow docs: Fix calls to currentTimeMillisRoman Elizarov2019-09-021-4/+4
| * | Fix propagation for stressTest property for nightly stress testsRoman Elizarov2019-09-042-0/+10
| * | Added a test checking future {}'s throw on LAZY.Tyson Henning2019-09-041-0/+11
| * | Fix of a bug in the semaphore (#1477)dkhalanskyjb2019-09-032-2/+39
| * | Repaired some of ListenableFuture.kt's cancellation corner cases.Tyson Henning2019-08-292-92/+596
| * | Fix samples in Flow docsVsevolod Tolstopyatov2019-08-291-2/+2
| * | Merge remote-tracking branch 'origin/master' into developRoman Elizarov2019-08-282-33/+113
| |\|
| | * Update top-level README with links:Roman Elizarov2019-08-272-33/+113
| * | Consistently unwrap exception in slow path of CompletionStage.asDeferredRoman Elizarov2019-08-282-8/+48
| * | Consistent naming for stress testsRoman Elizarov2019-08-287-27/+31
| * | Fixed ChannelReceiveOrClosedTest.testToString on JSRoman Elizarov2019-08-271-2/+3
| * | Moved ChannelReceiveOrClosedTest to proper dir, cleanup itRoman Elizarov2019-08-271-9/+2
| * | Ensure that all guide 'main' functions return UnitRoman Elizarov2019-08-271-2/+3
| * | Add ChannelLFStressTestRoman Elizarov2019-08-262-1/+115
| * | Merge remote-tracking branch 'origin/master' into developRoman Elizarov2019-08-263-3/+3
| |\|
| | * Reknit after update of shared-mutable-state-and-concurrency.mdRoman Elizarov2019-08-262-2/+2
| | * Update shared-mutable-state-and-concurrency.mdAleksandr Blokh2019-08-251-1/+1
| * | flow: fix recursion in combineTransform<T1, T2, R>()Jan Skrasek2019-08-252-1/+11
| * | Rename test to SegmentQueueLinearizabilityTest for consistencyRoman Elizarov2019-08-231-2/+2
| * | Merge remote-tracking branch 'origin/master' into developRoman Elizarov2019-08-238-15/+35
| |\|
| | * Merge pull request #1462 from Kotlin/version-1.3.0Vsevolod Tolstopyatov2019-08-23148-717/+3977
| | |\
| | | * Version 1.3.0Vsevolod Tolstopyatov2019-08-238-15/+35
| * | | Use Array.fill extension from stdlibJake Wharton2019-08-234-31/+1
| | |/ | |/|
| * | Merge branch 'master' into developVsevolod Tolstopyatov2019-08-228-15/+43
| |\|
| | * Merge pull request #1431 from Kotlin/version-1.3.0-RC2Vsevolod Tolstopyatov2019-08-0999-1226/+2487
| | |\
| | | * Version 1.3.0-RC2Vsevolod Tolstopyatov2019-08-098-15/+43
| * | | Update Kotlin to 1.3.50Vsevolod Tolstopyatov2019-08-224-8/+8
| * | | Eliminate tail-call optimization in CancellableContinuationJvmTestVsevolod Tolstopyatov2019-08-221-0/+1
| * | | Flow docs (#1432)Roman Elizarov2019-08-22100-161/+3199
| * | | Optimize select expression registration phase (#1445)Roman Elizarov2019-08-2212-241/+228
| * | | Restore context preservation invariant in flatMapMerge (#1452)Vsevolod Tolstopyatov2019-08-2214-151/+216
| * | | Introduce CoroutineDispatcher.asExecutor() extension (#1457)Roman Elizarov2019-08-223-8/+58