summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-12-20Snap for 9424327 from 0d8c13808e2ed5cf89c513fe198fe6348df98019 to ↵aml_con_331413000aml_con_331411000android13-mainline-conscrypt-releaseAndroid Build Coastguard Worker
mainline-conscrypt-release Change-Id: Ib95a7f0728a59429bd331a037b30c9fa3a40e358
2022-12-19docs: Remove duplicated phrase am: c08a545ad4Andrew Solovay
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20759942 Change-Id: I44e284be393b6eac82d5b5b9546348f348f364e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-19docs: Remove duplicated phraseAndrew Solovay
Doc had duplicated the phrase "for some reason", removing it. Docs-only change. Change-Id: I4cda97bfcfd5f1ef8609741443e1c07afe17109b Bug: 255896378 Test: [built docs with go/abtd]
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: ↵Josep del Río
9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 am: d2fdb41514 am: 242667158c am: 7d188c8207 am: d946501617 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616 Change-Id: I04fc9b761c1a92f56384f6e8f50e96ea5a700f42 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: ↵Josep del Río
9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 am: d2fdb41514 am: 242667158c am: 7d188c8207 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616 Change-Id: I630dbad4e9d619f0f9fb188cfb1d40ce81b36831 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: ↵Josep del Río
9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 am: d2fdb41514 am: 242667158c Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616 Change-Id: I193f10277d1250012df65355c2de605660f14f1c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: ↵Josep del Río
9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 am: d2fdb41514 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616 Change-Id: I1dae823cf968d9cf4772437b6391589cd2a960a7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: ↵Josep del Río
9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 am: 5c8400f0d8 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616 Change-Id: I521df4123142659f640ac32c5e72932eb3d71c6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: ↵Josep del Río
9a64b4bbe5 am: 4a3603ed0a am: d1d3755436 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616 Change-Id: Ia4addaae8e16ca21be1748fd28240d11b7908f8b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: ↵Josep del Río
9a64b4bbe5 am: 4a3603ed0a Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616 Change-Id: I80e83c3f6a8c81d1919ba1d2abbc9c7266737312 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-dev am: ↵Josep del Río
9a64b4bbe5 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20082616 Change-Id: Ie47160e41ef1751dbaecb5953fa851a13598d35c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Reconcile WorkSource parcel and unparcel code." into qt-devJosep del Río
2022-12-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d719af500a -s ours am: 348a503fc7 -s ours am: 0f4ed093b8 -s ours am: c1f210a7ee -s ours am: 4ca5ab9765 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20754853 Change-Id: I9de25072a00cceba951bb396511ad3bfe5eb6f98 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d719af500a -s ours am: 348a503fc7 -s ours am: 0f4ed093b8 -s ours am: c1f210a7ee -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20754853 Change-Id: I805ffccb044355b3a7a9087df0cf130dfc55add3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-17[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ↵Bill Yi
d719af500a -s ours am: 348a503fc7 -s ours am: 0f4ed093b8 -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20754853 Change-Id: I6f6486820efacf9eeffaacc2840bf6683c1e1bc8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
2022-12-16Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prodTreeHugger Robot
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 18:29:47 +0000