summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9189101c2e -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseXin Li
ours am: ed5d07f754 -s ours am skip reason: Change-Id Idc6eea7089eb139029872414b517da7d22560d6b with SHA-1 2e7bd2403b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I568c9f7f1e0e3deb561b13ccb2fd5ef99463b360
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 9189101c2e -s oursXin Li
am skip reason: Change-Id Idc6eea7089eb139029872414b517da7d22560d6b with SHA-1 2e7bd2403b is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I315ba3bcd0782d89b12a732a33e97ed0e8a7746d
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Idc6eea7089eb139029872414b517da7d22560d6b Change-Id: Ie6cac09a9b513e3712e1160d7d264161dddafa90
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b ↵Bob Badour
am: bd478b841a am: fa4f264b50 Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I463ca12b6e3e8682ac9640248f58b23e514837ee
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1b ↵Bob Badour
am: bd478b841a Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id0d168cac4dbd9441b9a96196c0904cad3037e04
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis" am: 8aa13b8c1bBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1588631 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6f2972f9515b77badd04faad270c0b3e624d4955
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/objenesis"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/objenesisBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp tck-android/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I6619c087965fdc808952cc6f56379acb1e7cbbfa
2020-11-24Mark ab/6881855 as merged am: dfada88c05 am: 2e7bd2403bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/13112858 Change-Id: Ibbcf145a8cba80301c2b71c56cc9fddeb18dcadc
2020-11-24Mark ab/6881855 as merged am: dfada88c05Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/13112858 Change-Id: Idc6eea7089eb139029872414b517da7d22560d6b
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I509db478b86ca6d376c28d2b65afeacda4e71d0c
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f92ee00a5 -s ours am: ↵Xin Li
c395eb8453 -s ours am: abb4b15533 -s ours am skip reason: Change-Id I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc with SHA-1 04afb274cf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12795753 Change-Id: I3bd87346820b29db5a5aa911e1010bb1d4b62291
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f92ee00a5 -s ours am: ↵Xin Li
c395eb8453 -s ours am skip reason: Change-Id I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc with SHA-1 04afb274cf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12795753 Change-Id: I6da007f3d3f34474a497e23ecc66ba8fd9b1bddb
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 3f92ee00a5 -s oursXin Li
am skip reason: Change-Id I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc with SHA-1 04afb274cf is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12795753 Change-Id: Id7d684a7479cb05ead2a8c4d51cbdee252f57b49
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc Change-Id: If4f47cb96e815c730e7c64219fd4b07b87ea5b73
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: ↵Xin Li
12cbb02ed8 -s ours am: 80cb71c3f4 -s ours am: d02a08aa4f -s ours am: 19a94cd75b -s ours am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: I8fb26b3c3abd18d36e2d2643271680fd13759f99
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: ↵Xin Li
12cbb02ed8 -s ours am: 80cb71c3f4 -s ours am: d02a08aa4f -s ours am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: If3d9d75e8918a362bcaaed003e26e1d3ccfc583a
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: ↵Xin Li
12cbb02ed8 -s ours am: 80cb71c3f4 -s ours am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: Id5fa044fda3d8a1a42897a567b68fb60b34b9b97
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: ↵Xin Li
12cbb02ed8 -s ours am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: I9b7ad21c92edcabbdc11d56d470c3bea6afb4148
2020-09-11[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s oursXin Li
am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1422358 Change-Id: Ieb676ef6077216f0a7777bac9bd3166d4abd1c7f
2020-09-10Merge "Merge Android R"Xin Li
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I688cf9a8010c1def4043e5b1caa819dbf18da5f4 Change-Id: I4889d325202b6da35685631e0a92fad599fa138b
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am: 0584e17af2 -s ours am: 131a7515c5 -s ours am: e75ffbaaa3 -s ours am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12469676 Change-Id: Iddf81e4c7eb618eaf293424e57a49e66ca69fbce
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am: 0584e17af2 -s ours am: 131a7515c5 -s ours am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12469676 Change-Id: I3609e2a7014a2693d3bc7b1d11f00e83baea09b1
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am: 0584e17af2 -s ours am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12469676 Change-Id: Ie732ca775c26997ca35a790c9b44f66a843cd83b
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: c3ac2cd7ed -s ours am skip reason: Change-Id I0d83429a02c4b72bf9bee84e8817641b2fae5eeb with SHA-1 3d5ad5c763 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/objenesis/+/12469676 Change-Id: I0796ac26290a82d6f550ed1e94361fd23feb7c9c
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I0d83429a02c4b72bf9bee84e8817641b2fae5eeb Change-Id: I688cf9a8010c1def4043e5b1caa819dbf18da5f4
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40 am: ↵Treehugger Robot
e5b2a52dfd am: 3d5ad5c763 am: 04afb274cf am: ed36f91f6d Change-Id: Icd5dfe1172adb23bb26afa7e19965c2e8acec7bc
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40 am: ↵Treehugger Robot
e5b2a52dfd am: 3d5ad5c763 am: 04afb274cf Change-Id: I17869d03beb3553d1b3532f25bcf2d831e0b21ff
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40 am: ↵Treehugger Robot
e5b2a52dfd am: 3d5ad5c763 Change-Id: I11f599adfd061c2ba44a760ca09cfcb72d6f5fcc
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40 am: e5b2a52dfdTreehugger Robot
Change-Id: I0d83429a02c4b72bf9bee84e8817641b2fae5eeb
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE" am: ef460f3c40android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I34e7d0d8a4dc8f57d1d40d6c33a09db8f161790e
2020-04-29Merge "Add METADATA to objenesis: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to objenesis: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I78dfabd11e779b12de4d07d5ff82679d5bd576b0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2406aeb64f -s ours am: 4146eff4f9 am: b536c37843 am: a07b79d542 -s ours am skip reason: subject contains skip directive Change-Id: I8f70f358eb92632d66e7d620b205d52460c87f71
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2406aeb64f -s ours am: 4146eff4f9 am: b536c37843 Change-Id: Iaf63ac788b44bf2b1010d818878d10e2e8312737
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2406aeb64f -s ours am: 4146eff4f9 Change-Id: I616553351a2463298695ed74304057387d1cafb8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 2406aeb64f -s ours am skip reason: subject contains skip directive Change-Id: I8685ded302a430c1ca207f3ecaf1414eeeace18e
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I02f7adaf5b75cd5584b297c9591afbf1bd042225
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f05b1f0f8d -s ours am: d110208f1e am: f7e7345eed am: dba22fcecf -s ours am skip reason: subject contains skip directive Change-Id: Ie85aa37eba219f0c1e63508280deeb0a558f8318
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f05b1f0f8d -s ours am: d110208f1e am: f7e7345eed Change-Id: I71087ffbaf3731493520cdb3914123960442e61c
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f05b1f0f8d -s ours am: d110208f1e Change-Id: I817be50551a5f65d6ced98f50c9f95fdd65432d3
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: f05b1f0f8d -s ours am skip reason: subject contains skip directive Change-Id: I3c4ff2f5209eab89ff83d0ec1a58931848d299ff
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: f05b1f0f8d Change-Id: I820964247ee32e481a1d631346612835159c2a8e
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Ida0141d56462c57257c00e2a199cc0d8484108a8
2020-02-26Merge "Revert "Pin objenesis to Java language level 8.""Jerome Gaillard
2020-02-25Merge "Add jgaillard to OWNERS" am: bc6332a3bf am: 1595b2de78 am: 30684c7393 ↵Automerger Merge Worker
am: 19ff6a4756 am: e42a796794 Change-Id: Ifc4602ac1dd42d24d4bde936818ad5f587acf00c
2020-02-25Merge "Add jgaillard to OWNERS" am: bc6332a3bf am: 1595b2de78 am: 30684c7393 ↵Automerger Merge Worker
am: 19ff6a4756 Change-Id: I29f741655b72f5ebd53153f78e4c529efd4607b4
2020-02-25Merge "Add jgaillard to OWNERS" am: bc6332a3bf am: 1595b2de78 am: 30684c7393Automerger Merge Worker
Change-Id: Ic8d35d59fd262d915495b586a57a9c09fdb885ef
2020-02-25Merge "Add jgaillard to OWNERS" am: bc6332a3bf am: 1595b2de78Automerger Merge Worker
Change-Id: If7cdb2d388f9e17195152d3a37c868aba828fcfa
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 09:55:26 +0000