- Oct 09, 2023
-
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am: b744140f -s ours am: 84be83e0 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: Ie8d16b99eb84d835b2100b6487c07580f0c02425 Signed-off-by:
Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am: ce484b01 -s ours am: f85d675a -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I1510fa41273f8853d8325c0f72c0381bed9a6ace Signed-off-by:
-
Automerger Merge Worker authored
* changes: [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ca4b237b -s ours [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 30e2ac44 -s ours
-
Treehugger Robot authored
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ca4b237b -s ours am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24973599 Change-Id: Ic8557e1ad14162a1a046100710aca4484aa24676 Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am: e5388293 -s ours am: 2ad05e4f -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I87092c34d6a44316ea156a1d4ed4c29de08762e7 Signed-off-by:
-
Bill Yi authored
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24973599 Change-Id: I62708311b4c6d0bcb28210d1ae2cc4b442570379 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am: 630ba09a -s ours am: 4b362d9c -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I1f55399734e6507b1108e311d5e5285cce26c8e1 Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am: e5388293 -s ours am: d57dc02a -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I1c063aec93a295f85b8458945b2535497c7a3e03 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am: 630ba09a -s ours am: 837d3cb6 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: Iaa619c51aea37e26dc2d55fc9971dede6cc094b5 Signed-off-by:
-
Treehugger Robot authored
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am: b744140f -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: Ib878314749bc2a419dcb811526e5f7fafa7dde0b Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am: e5388293 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: Idf4f5d3f17839ff4e67eb593b4e0d4c30f6ade30 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am: ce484b01 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I5be88163182a404f7c82e877b3ab9e4ded98dfc0 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am: 630ba09a -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: Ifde096fa02ce13b293fbaf7cb5f6189c1b90ca65 Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am: e5388293 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I3178dcb1b3826ac0f11b9d99ea7d706f55c95ce8 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am: 630ba09a -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I4039cdd7d934218e566cb2c085c0bd0a6483841b Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 82eb6fc2 am: 7d45b38e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ia112ba79d66fe1d62d0beb35d39cd69ef52d8a98 Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I55179d7dbc662477b9feaf98ab7981a76e4fc815 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: Ice5740a69578c3ab64463f8586a337f4596bcd86 Signed-off-by:
-
Dmitry Dementyev authored
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a am: 9b0970ed am: a994c6f0 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I32f841661b4fb451462e77d706aa86610c0c7b56 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours am: a2b62908 -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I7598f74e82cdfeb9a27762095eae4f349b910611 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: b5bbb593 -s ours am: bcc8940c -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: I5b6f5b4de87d63567deb5d372e6b4d10d6f5269a Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am: ced01127 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I98406435b5eae9816c10eb73f1c4d2f2d3b7c000 Signed-off-by:
-
Pawan Wagh authored
[automerger skipped] Use readUniqueFileDescriptor in incidentd service am: 3904fb61 -s ours am: d09f4cf9 -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I8074f0e03706dab1d97fbb49e83d78ecd8519cf8 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 3b0e671d am: 31428b9e Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ia6ed52bd0b91eec811bb6e3cd512573cca4e6f31 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a" into udc-dev-plus-aosp am: 4fed81bb am: e3786984 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I4e8b7189d7759d41ef2b1d0875adeae15c02b32b Signed-off-by:
-
Eric Biggers authored
Merge "Fix some comments in AndroidKeyStoreMaintenance.java" into main am: 7c778823 am: 2e783419 am: 82f257b5 am: b2f2935c Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2778008 Change-Id: I5c79dd56aebfabea639f8dae02982f44361d9acb Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: 0b6fee96 -s ours am: 85ce1fd8 -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: Ia131f4e96b8f5f40ff5791f9bf89916cd2038c2e Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 82eb6fc2 am: bf01af8d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ic8ebb4a6016444857651cc772434c9bf2ac7c0f5 Signed-off-by:
-
Dmitry Dementyev authored
Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a am: 9b0970ed am: 47de64a3 Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: I0be6d15109e837d36728adc72f3808b91a81d73b Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours" into udc-d1-dev-plus-aosp am: aeccbc58 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 e5e5d53c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I4207aec616c5e1b2437533e9ca5ab63bfeaa1398 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Merge "Truncate user data to a limit of 500 characters" into sc-v2-dev am: 24080817 am: fe790c66 am: 9d1ae987 -s ours am: 31c2eb63 -s ours am: 70ae1f4e -s ours am: ffeefd07 -s ours am: b84d5d36 -s ours am skip reason: skipped by user tetianameronyk Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24664788 Change-Id: I2e790125bf4237acf1c21ec2ca895a209a0cc89b Signed-off-by:
-
Automerger Merge Worker authored
Merge "[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: 187a8ce4 -s ours" into udc-d1-dev-plus-aosp am: 984a4dc3 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 e5e5d53c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: I408dee91b5a1a802504e9ff4b40adf78880b2867 Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: 187a8ce4 -s ours am: ea8e5857 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: Ica09524d0dddd0f733525475b6b094696e64d59f Signed-off-by:
-
Tetiana Meronyk authored
[automerger skipped] Truncate user data to a limit of 500 characters am: e5e5d53c -s ours am: 32f1ae65 -s ours am: b5bbb593 -s ours am: 0a67ee05 -s ours am skip reason: Merged-In I633dc10974a64ef2abd07e67ff2d209847129989 with SHA-1 59042a32 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24967558 Change-Id: Ibd2cc106d190deda6445c0f67e0eb8becfd65b4c Signed-off-by:
-
Yao Chen authored
[automerger skipped] Merge "Use readUniqueFileDescriptor in incidentd service" into tm-qpr-dev am: 1492058a -s ours am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I466a1ac3bc357b93c5e844cb3660c44a0d7690fd Signed-off-by:
-
Pawan Wagh authored
am skip reason: Merged-In Ibe03a17dee91ac5bf25d123d4fd9c0bdd3c7d80e with SHA-1 db60b2f5 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24608688 Change-Id: I48b0b2072796d81ea128c5d695f521b645c669c0 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: a8f86248" into udc-dev am: 7235ee18 am: 3b0e671d Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ib11d882e59093bc8821330e99b3863d50e248079 Signed-off-by:
-
Automerger Merge Worker authored
Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6 am: 916057d1 am: ba2eb5ba am: 096a905a" into udc-dev-plus-aosp am: 4fed81bb Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24945646 Change-Id: Ibe1b56f43ab2e5c240f5436da56518cb2d9727a4 Signed-off-by:
-
Eric Biggers authored
Merge "Fix some comments in AndroidKeyStoreMaintenance.java" into main am: 7c778823 am: 2e783419 am: 82f257b5 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2778008 Change-Id: Ib6fb263e19a7673a579de9a6e3c1c134905c9fa9 Signed-off-by:
-
