summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Snap for 6826413 from 6ec83c725892e17e327e1480c1781a89964b7118 to andr...androidx-camerax-releaseandroid-build-prod (mdb)2020-09-184-25/+11
|\
| * Snap for 6826413 from 6ec83c725892e17e327e1480c1781a89964b7118 to androidx-ca...android-build-prod (mdb)2020-09-184-25/+11
|/|
| * Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedandroidx-tracing-releaseandroidx-startup-releaseandroidx-hilt-releaseXin Li2020-08-270-0/+0
| |\
| | * Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist." am: ...Treehugger Robot2020-06-171-2/+1
| | |\
| | * \ Merge "Suppressing warnings during build of Doclava" am: badd1661de am: b094e...Jeff Gaston2020-05-261-0/+5
| | |\ \
| | * \ \ Merge changes from topic "ctor-refs" am: dc123f2a39 am: b3adcbf561Treehugger Robot2020-05-052-1/+28
| | |\ \ \
| | * \ \ \ [automerger skipped] Fix broken links to inner class constructors. am: 0b7f6c...Andrew Sapperstein2020-05-050-0/+0
| | |\ \ \ \
| | * \ \ \ \ [automerger skipped] Stop suppressing @see tags in frameworks/base. am: 06f3b...Andrew Sapperstein2020-05-050-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge "Stop suppressing @see tags in frameworks/base." into rvc-dev am: a1bf6...Andrew Sapperstein2020-05-021-10/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "Stop suppressing @see tags in frameworks/base." into rvc-devandroid11-devAndrew Sapperstein2020-05-021-10/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Stop suppressing @see tags in frameworks/base.Andrew Sapperstein2020-05-011-10/+2
| | * | | | | | | | Fix broken links to inner class constructors. am: 94b9299ba1Andrew Sapperstein2020-05-021-15/+1
| | |\| | | | | | |
| | | * | | | | | | Fix broken links to inner class constructors.Andrew Sapperstein2020-05-011-15/+1
| | | |/ / / / / /
| | * | | | | | | Merge "Add METADATA to doclava: Apache2=NOTICE" am: 927d8aa74c am: c1edd3edcbTreehugger Robot2020-05-011-0/+3
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into st...Xin Li2020-04-100-0/+0
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge "Make doclava compatible with both JDK 8 and 11." am: 17bfa62ff6 am: 39...Treehugger Robot2020-03-201-8/+11
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge "Revert "Revert "Revert "Remove Java 8 requirement."""" am: a6ef773c58 ...George Mount2020-03-201-5/+8
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge "Revert "Revert "Remove Java 8 requirement.""" am: d0aa1ae1ef am: a0980...Aurimas Liutikas2020-03-191-8/+5
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901...Xin Li2020-03-190-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "Add disabled and loggingonly support to compat ch...Automerger Merge Worker2020-03-060-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Add disabled and loggingonly support to compat changes docs am: cb64f29fb4Automerger Merge Worker2020-03-062-11/+54
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Add disabled and loggingonly support to compat changes docsatrost2020-03-062-11/+54
| | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge "Revert "Remove Java 8 requirement."" am: abf4da89c6 am: a1e4fde031 am:...Automerger Merge Worker2020-02-131-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove Java 8 requirement." am: 4cbbfe1325 am: d1604b71b5 am: a660047387Automerger Merge Worker2020-02-131-8/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Generate docs from compat config." am: 526f4c1511 am: 64963e0ca5 am: b...Automerger Merge Worker2020-02-043-1/+280
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915...Xin Li2019-10-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ...Xin Li2019-09-080-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] Merge "DO NOT MERGE - Merge Android 10 into master" am: ...Xin Li2019-09-050-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Ignore tags in comments that are actually Java annotations" am: af4aca...Andrea Falcone2019-07-102-2/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ [automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (56...Xin Li2019-07-020-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Remove workaround to suppress reference errors." am: cf31db9702Treehugger Robot2020-08-102-27/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge "Remove workaround to suppress reference errors."Treehugger Robot2020-08-102-27/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Remove workaround to suppress reference errors.Andrew Sapperstein2020-08-102-27/+1
| | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | / Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist." am: ...Treehugger Robot2020-06-171-2/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Merge "Remove NotificationCompat.MessagingStyle.Message from allowlist."android-r-beta-3android-r-beta-2Treehugger Robot2020-06-171-2/+1
| |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Remove NotificationCompat.MessagingStyle.Message from allowlist.Andrew Sapperstein2020-06-091-2/+1
| |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge "Suppressing warnings during build of Doclava" am: badd1661deJeff Gaston2020-05-261-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge "Suppressing warnings during build of Doclava"Jeff Gaston2020-05-261-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Suppressing warnings during build of DoclavaJeff Gaston2020-05-261-0/+5
| | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | / Merge changes from topic "ctor-refs" am: dc123f2a39Treehugger Robot2020-05-052-1/+28
| |\| | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge changes from topic "ctor-refs"Treehugger Robot2020-05-053-20/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Add workaround for androidx prebuilt referencesAndrew Sapperstein2020-05-052-1/+28
| * | | | | | | | | | | | | | | | | | | | Fix broken links to inner class constructors. am: 0b7f6c6aaaAndrew Sapperstein2020-05-051-15/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Fix broken links to inner class constructors.Andrew Sapperstein2020-05-021-15/+1
| * | | | | | | | | | | | | | | | | | | Stop suppressing @see tags in frameworks/base. am: 06f3bffd93Andrew Sapperstein2020-05-051-10/+2
| |\| | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Stop suppressing @see tags in frameworks/base.Andrew Sapperstein2020-05-021-10/+2
| | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | / Merge "Add METADATA to doclava: Apache2=NOTICE" am: 927d8aa74cTreehugger Robot2020-05-011-0/+3
| |\| | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge "Add METADATA to doclava: Apache2=NOTICE"Treehugger Robot2020-05-011-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | Add METADATA to doclava: Apache2=NOTICEBob Badour2020-04-301-0/+3
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li2020-04-090-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |