summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ed0b015aab -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: b9bf09e3d9 -s ours am skip reason: Change-Id Icbf34e145538b85a23872d44352c5b2e3eff4f9e with SHA-1 ef8e754ddb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I463706017f37cc666ead90ebebece7e1b62ef43c
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: ed0b015aab -s oursXin Li
am skip reason: Change-Id Icbf34e145538b85a23872d44352c5b2e3eff4f9e with SHA-1 ef8e754ddb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icad0480d312ea71b68529071d280d5e75af480a2
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: Icbf34e145538b85a23872d44352c5b2e3eff4f9e Change-Id: Iec110cc40c7b38f8b5715ca7e7bf0524889ea1a0
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libphonenumber" am: ↵Bob Badour
36b02a4456 am: 48e1545956 am: f4df5dcd94 Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/1588922 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3edaa6e907043e54f1b569a49a7dfddf5213ad8a
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libphonenumber" am: ↵Bob Badour
36b02a4456 am: 48e1545956 Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/1588922 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I623bac19b595026e23c75e1dc34a067989a56b5b
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libphonenumber" am: 36b02a4456Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/1588922 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I57f198bb400941e8d9a3045354049b6ce6173f09
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libphonenumber"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libphonenumberBob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic55f8749ef803ce582c58707e956432e318a3b05
2020-11-24Mark ab/6881855 as merged am: e99eb08f97 am: ef8e754ddbXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libphonenumber/+/13112844 Change-Id: Id64afaa46d124fc78ab589916c21ab77d56b565f
2020-11-24Mark ab/6881855 as merged am: e99eb08f97Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libphonenumber/+/13112844 Change-Id: Icbf34e145538b85a23872d44352c5b2e3eff4f9e
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I61cb533eb0d28139dd0f19b5a701c2e5dd73b743
2020-11-02Merge "Add maxTargetSdk restriction to unused APIs." am: 6bcd335c6a am: ↵Mathew Inwood
d1dda8ac48 am: a30f3e0b34 am: 6dceba437c Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/1467828 Change-Id: I0ace32ac2192705b5662c21cfef97dabc4a18f77
2020-11-02Merge "Add maxTargetSdk restriction to unused APIs." am: 6bcd335c6a am: ↵Mathew Inwood
d1dda8ac48 am: a30f3e0b34 Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/1467828 Change-Id: Ie6671b3058bea303ce0b2b8d7d68348e63b51086
2020-11-02Merge "Add maxTargetSdk restriction to unused APIs." am: 6bcd335c6a am: ↵Mathew Inwood
d1dda8ac48 Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/1467828 Change-Id: I394123010e9a2fa4e30d9aa3d379861d65e28e9e
2020-11-02Merge "Add maxTargetSdk restriction to unused APIs." am: 6bcd335c6aMathew Inwood
Original change: https://android-review.googlesource.com/c/platform/external/libphonenumber/+/1467828 Change-Id: Id281a2781715f6cfb879dd8754745c1c7aec47f2
2020-11-02Merge "Add maxTargetSdk restriction to unused APIs."Mathew Inwood
2020-10-28Add maxTargetSdk restriction to unused APIs.Mathew Inwood
These are APIs that have @UnsupportedAppUsage but for which we don't have any evidence of them currently being used, so should be safe to remove from the unsupported list. Bug: 170729553 Test: Treehugger Change-Id: Ida716516dd82c00ceb446b1af07a77b1af36b66c
2020-04-29Merge "Add METADATA to libphonenumber: Apache2=NOTICE" am: babc1dc9f2 am: ↵Treehugger Robot
127fc89c7f am: fc47ea7ffc am: bba6db0f9e am: c4ea9b00a0 Change-Id: I488e13f2b1953acf0cc6c5a318248e67de094f9b
2020-04-29Merge "Add METADATA to libphonenumber: Apache2=NOTICE" am: babc1dc9f2 am: ↵Treehugger Robot
127fc89c7f am: fc47ea7ffc am: bba6db0f9e Change-Id: I5ec3d0660f56803c3b495b309d0a9dbb059e78f0
2020-04-29Merge "Add METADATA to libphonenumber: Apache2=NOTICE" am: babc1dc9f2 am: ↵Treehugger Robot
127fc89c7f am: fc47ea7ffc Change-Id: Ie7a257ea35f11bbe805ed525b3750b254f714e05
2020-04-29Merge "Add METADATA to libphonenumber: Apache2=NOTICE" am: babc1dc9f2 am: ↵Treehugger Robot
127fc89c7f Change-Id: Id2b1015caee00f7bc803c425e69574ed9b034a4e
2020-04-29Merge "Add METADATA to libphonenumber: Apache2=NOTICE" am: babc1dc9f2android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I9a64e2904f0685a0bed91a4001f1d0efa7f3a13f
2020-04-29Merge "Add METADATA to libphonenumber: Apache2=NOTICE"Treehugger Robot
2020-04-28Add METADATA to libphonenumber: Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I92382e3f2d65803be76ee569e554755c43b8488e
2019-12-17Merge "Use new UnsupportedAppUsage annotation." am: f1839a9203 am: ↵r_aml_301500702android-mainline-12.0.0_r55android-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_r45android-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_r48android-11.0.0_r47android-11.0.0_r46android-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-releaseAutomerger Merge Worker
024e260d05 am: 41e3b486d5 Change-Id: I5c715ef8efe706da68b11bb0038337b0d916198b
2019-12-17Merge "Use new UnsupportedAppUsage annotation." am: f1839a9203 am: 024e260d05android-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: I228ac79298b7641a8f4fc636277a27b6f81ae0ed
2019-12-17Merge "Use new UnsupportedAppUsage annotation."Artur Satayev
am: f1839a9203 Change-Id: I4c09f599c643340daf7f69e257b7a7a096f8f272
2019-12-17Merge "Use new UnsupportedAppUsage annotation."android-r-preview-1Treehugger Robot
2019-12-10Use new UnsupportedAppUsage annotation.Artur Satayev
Existing annotations in libcore/ and frameworks/ will deleted after the migration. This also means that any java library that compiles @UnsupportedAppUsage requires a direct dependency on "unsupportedappusage" java_library. Bug: 145132366 Test: m && diff unsupportedappusage_index.csv Change-Id: I843f94760157612715b7c34014026f77d64e0087
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: c0a1cf3b97 am: d7e60be747 -s ours am skip reason: subject contains skip directive Change-Id: I0a655b3eb36492007b66c0c8c509187b78d59e52
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master am: c0a1cf3b97 Change-Id: I807ad5588769fbc12d0ba258acd8988794d56d0d
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ib514883c10281390c01e3a4a4a8fb7b45ae62efd
2019-10-17Merge "Update libphonenumber to v8.10.21" am: 7cc0cecd8c am: 3a233558f5 am: ↵Sarah Chin
bfef4b531d am: cc60938be5 Change-Id: Iabf06bb45f3af3a1dc2b97b8869056c5693ed806
2019-10-17Merge "Update libphonenumber to v8.10.21" am: 7cc0cecd8c am: 3a233558f5Sarah Chin
am: bfef4b531d Change-Id: I4124f0e66e2ad0f0a4d6cb16cac1a459d00fcc20
2019-10-17Merge "Update libphonenumber to v8.10.21" am: 7cc0cecd8cSarah Chin
am: 3a233558f5 Change-Id: Icf2c9d806e9156488b278dd7dbaade729791bec6
2019-10-17Merge "Update libphonenumber to v8.10.21"Sarah Chin
am: 7cc0cecd8c Change-Id: I586568ccd8dc67d29ebf7486704518fbe7f711c3
2019-10-17Merge "Update libphonenumber to v8.10.21"Sarah Chin
2019-10-16Update libphonenumber to v8.10.21Sarah Chin
Fixes: 142827352 Test: cts and vogar Change-Id: I7c3f7adbe5df11f4253fa2716c10c9731bd7f7fd
2019-10-04Merge "Update libphonenumber to v8.10.20" am: 116b804221 am: 5ed56ee621 am: ↵Sarah Chin
9c850d5bc6 am: 720bb1b782 Change-Id: I5380a73d63dfb475f35f0c2fecb2f2f574eaee16
2019-10-04Merge "Update libphonenumber to v8.10.20" am: 116b804221 am: 5ed56ee621Sarah Chin
am: 9c850d5bc6 Change-Id: I0aea5d6a49c6a10d0f7f51fa6f09158307d6e7ae
2019-10-04Merge "Update libphonenumber to v8.10.20" am: 116b804221Sarah Chin
am: 5ed56ee621 Change-Id: I0afea1eddf400bea06a7dcdb5f6685167647ec88
2019-10-04Merge "Update libphonenumber to v8.10.20"Sarah Chin
am: 116b804221 Change-Id: Ifb5325fd2ea924b30c6b5ac132ef5a3ea6400fd4
2019-10-04Merge "Update libphonenumber to v8.10.20"ndk-sysroot-r21Sarah Chin
2019-10-03Update libphonenumber to v8.10.20Sarah Chin
Fixes: 142036136 Test: cts and vogar Change-Id: Ibaf98b4dc738c942462600752240c67fdbd00162
2019-09-25Merge "Update libphonenumber to v8.10.19" am: d28f7f8393 am: 11295ee942 am: ↵Sarah Chin
b9a9f5db21 am: ecd627d132 Change-Id: Ic7494e652b25473a2ae8121fd0a1a0e04ea5ce04
2019-09-25Merge "Update libphonenumber to v8.10.19" am: d28f7f8393 am: 11295ee942Sarah Chin
am: b9a9f5db21 Change-Id: I380992cc1167568d51eeaf60e5c5db39e295fd94
2019-09-25Merge "Update libphonenumber to v8.10.19" am: d28f7f8393Sarah Chin
am: 11295ee942 Change-Id: Ie2f7fe19aa153637c764131d5843b7f28d7ced00
2019-09-25Merge "Update libphonenumber to v8.10.19"Sarah Chin
am: d28f7f8393 Change-Id: I28d62e4be58a96ba43e026c7dd95aecfc41c3f5d
2019-09-25Merge "Update libphonenumber to v8.10.19"Sarah Chin
2019-09-25Update libphonenumber to v8.10.19Sarah Chin
Fixes: 141349847 Test: cts and vogar Change-Id: If0baa0bd6f6f0a3a329af92f59ef0b2675c88808
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 12:28:23 +0000