summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterandroidx-localbroadcastmanager-releaseandroidx-browser-releaseandroidx-benchmark-releaseandroidx-annotation-annotation-experimental-releaseXin Li2019-09-080-0/+0
|\
| * Merge "Ignore tags in comments that are actually Java annotations" am: af4aca...Andrea Falcone2019-07-102-2/+11
| |\
| | * Merge "Ignore tags in comments that are actually Java annotations" am: af4aca...Andrea Falcone2019-07-102-2/+11
| | |\
| * | | DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-020-0/+0
| |\| |
* | | | Merge "DO NOT MERGE - Merge Android 10 into master"ndk-sysroot-r21androidx-coordinatorlayout-releaseandroidx-biometric-releaseandroidx-autofill-releaseXin Li2019-09-0514-95/+206
|\ \ \ \
| * | | | DO NOT MERGE - Merge Android 10 into masterXin Li2019-09-0414-95/+206
|/| | | | | | |_|/ | |/| |
| * | | Merge "Ignore tags in comments that are actually Java annotations"Andrea Falcone2019-07-102-2/+11
| |\ \ \ | |/ / / |/| | / | | |/ | |/|
* | | Merge "Ignore tags in comments that are actually Java annotations"android-o-mr1-iot-release-1.0.14Treehugger Robot2019-07-102-2/+11
|\ \ \
| * | | Ignore tags in comments that are actually Java annotationsAndrea Falcone2019-07-102-2/+11
|/ / /
| * / DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aos...Xin Li2019-07-0114-95/+206
|/| | | |/
| * Merge "Automatic documentation for "@Column" annotation."android-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseJeff Sharkey2019-03-042-0/+52
| |\
| | * Automatic documentation for "@Column" annotation.Jeff Sharkey2019-02-152-0/+52
| * | Merge "Update doclava to use @since tags from comments."Dirk Dougherty2019-02-256-29/+79
| |\ \
| | * | Update doclava to use @since tags from comments.Dirk Dougherty2019-02-236-29/+79
| | |/
| * | Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| |\ \ | | |/ | |/|
| | * Merge stage-aosp-master into pi-dev-plus-aospXin Li2019-02-250-0/+0
| | |\ | |_|/ |/| |
* | | DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterandroid-o-mr1-iot-release-1.0.13androidx-vectordrawable-releaseandroidx-savedstate-releaseandroidx-preference-releaseandroidx-jetifier-releaseandroidx-arch-core-releaseXin Li2019-02-200-0/+0
|\ \ \
| | * \ Merge "Update doclava owners"Tor Norbye2019-02-151-0/+3
| | |\ \
| | | * | Update doclava ownersTor Norbye2019-02-141-0/+3
| | * | | Merge "Add @deprecatedSince and @apiSince as knowns tags" am: f094924d25 am: ...Tor Norbye2019-02-151-0/+2
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Merge "Add @deprecatedSince and @apiSince as knowns tags" am: f094924d25Tor Norbye2019-02-151-0/+2
| | |/| | |/|/ | |/| |/| |
* | | Merge "Add @deprecatedSince and @apiSince as knowns tags"Tor Norbye2019-02-151-0/+2
|\ \ \
| * \ \ Merge "Add @deprecatedSince and @apiSince as knowns tags"android-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10oreo-mr1-iot-releaseandroidx-collection-releaseTor Norbye2019-02-151-0/+2
| |\ \ \
| | * | | Add @deprecatedSince and @apiSince as knowns tagsTor Norbye2019-02-131-0/+2
| | | | * Merge "Add default code reviewers into OWNERS" am: ec7a9ad9e9 am: c67e748787Chih-hung Hsieh2019-01-151-0/+4
| | | | |\ | | | | |/ | | | |/|
| | | * | Merge "Add default code reviewers into OWNERS" am: ec7a9ad9e9Chih-hung Hsieh2019-01-151-0/+4
| | | |\ \ | |_|_|/ / |/| | | |
* | | | | Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-151-0/+4
|\| | | |
| * | | | Merge "Add default code reviewers into OWNERS"Chih-hung Hsieh2019-01-151-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add default code reviewers into OWNERSChih-Hung Hsieh2019-01-151-0/+4
| |/ / /
| | | * [automerger skipped] Merge "DO NOT MERGE" am: 868494cd34 -s ours am: 7322c54...The Android Open Source Project2018-12-060-0/+0
| | | |\ | | | |/ | | |/|
| | * | [automerger skipped] Merge "DO NOT MERGE" am: 868494cd34 -s oursThe Android Open Source Project2018-12-060-0/+0
| | |\ \ | |_|/ / |/| | |
* | | | [automerger skipped] Merge "DO NOT MERGE"The Android Open Source Project2018-12-060-0/+0
|\| | |
| * | | Merge "DO NOT MERGE"android-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7Treehugger Robot2018-12-070-0/+0
| |\ \ \
| | * | | DO NOT MERGEThe Android Open Source Project2018-12-060-0/+0
| |/| | |
| | * | | Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releasepie-platform-releasepie-cuttlefish-testingBill Yi2018-11-289-93/+71
| | |\ \ \
| | | | | * Merge "Add a version of doclava without guava built in" am: 25ef586c68 am: 3a...Julien Desprez2018-11-061-1/+19
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | Merge "Add a version of doclava without guava built in" am: 25ef586c68Julien Desprez2018-11-061-1/+19
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge "Add a version of doclava without guava built in"Julien Desprez2018-11-061-1/+19
|\| | | | |
| * | | | | Merge "Add a version of doclava without guava built in"android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-n-iot-release-ihome-igv1nougat-iot-releaseJulien Desprez2018-11-061-1/+19
| |\ \ \ \ \
| | * | | | | Add a version of doclava without guava built inJulien Desprez2018-11-051-1/+19
| |/ / / / /
| | | | | * [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE...Bill Yi2018-10-240-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | [automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
|\| | | | |
| * | | | | Merge pie-platform-release to aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
| |\| | | |
| | | | | * [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| | | | | |\ | | | | | |/ | | | | |/|
| | | | * | [automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ...Bill Yi2018-10-240-0/+0
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi2018-10-240-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Snap for 4818534 from 651fcf9089db41046473320602883ffd4a3bba60 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r3android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r2android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-releaseandroid-build-team Robot2018-06-032-11/+35
| |\ \ \ \ \
| * \ \ \ \ \ Snap for 4767765 from b2999d2c1da5b550a0d2b997d2f982ce88e51255 to pi-releaseandroid-build-team Robot2018-05-081-7/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Snap for 4759746 from b69fd76633ffa4eaf21186dcfb4636bdd4d6e57b to pi-releaseandroid-build-team Robot2018-05-032-4/+20
| |\ \ \ \ \ \ \