TreeHugger Robot
|
86bb63a3e1
|
Merge "Post updateClockViews when called within onLayout" into tm-dev am: 94c91a89cf am: 9868ad9505
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18738508
Change-Id: I688f92dc973b3d94e8f701c4d9a74689395961c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 16:33:41 +00:00 |
|
TreeHugger Robot
|
0fd061faab
|
Merge "Post updateClockViews when called within onLayout" into tm-dev am: 94c91a89cf am: b867f3b273
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18738508
Change-Id: Id8627b74e1c275eee4469c027c4ef8339ea856a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 16:33:25 +00:00 |
|
TreeHugger Robot
|
9868ad9505
|
Merge "Post updateClockViews when called within onLayout" into tm-dev am: 94c91a89cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18738508
Change-Id: Id52acbd509683de94186405b4a906fe201c0a6ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 16:13:45 +00:00 |
|
TreeHugger Robot
|
b867f3b273
|
Merge "Post updateClockViews when called within onLayout" into tm-dev am: 94c91a89cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18738508
Change-Id: I24d8e6d7ee853bd2b33707ce18dfe9dc89c02fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 16:11:57 +00:00 |
|
TreeHugger Robot
|
94c91a89cf
|
Merge "Post updateClockViews when called within onLayout" into tm-dev
|
2022-06-08 15:28:24 +00:00 |
|
Automerger Merge Worker
|
af4e70f550
|
Merge "Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev am: 2f541168e3 am: 5d0d6297c7" into tm-d1-dev-plus-aosp
|
2022-06-08 15:02:04 +00:00 |
|
Jeff DeCew
|
5eff2297b5
|
Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev am: 2f541168e3 am: 20de84c795
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18774493
Change-Id: I6e5aec06f3aae86d5d82e55af1088468e616055f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 15:01:52 +00:00 |
|
Jeff DeCew
|
aee6930a5b
|
Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev am: 2f541168e3 am: 5d0d6297c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18774493
Change-Id: I5e39c5256031773fd214d159d119b72c62afa401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 15:01:52 +00:00 |
|
Jeff DeCew
|
20de84c795
|
Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev am: 2f541168e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18774493
Change-Id: I1d1fb9e754acdea5872319c866b96f855c3415fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 14:36:50 +00:00 |
|
Jeff DeCew
|
5d0d6297c7
|
Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev am: 2f541168e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18774493
Change-Id: Icf7460f1901f12a89d5f49710fdb3235b9e46ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 14:35:16 +00:00 |
|
Jeff DeCew
|
2f541168e3
|
Merge "Dump all of AmbientState & NSSL height/padding" into tm-dev
|
2022-06-08 13:58:02 +00:00 |
|
Victor Chang
|
7c025d5c6a
|
Merge changes from topic "icu71" am: cbe922a79b am: e73a4dc9ae am: f4a0c5d429
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116805
Change-Id: I06db34b0b09de9b43d905ada54f2fc6d6145d631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 13:47:22 +00:00 |
|
Victor Chang
|
6037de2eed
|
Regenerate LocaleDataTables.cpp due to ICU 71 upgrade am: 593ae0b0c9 am: 37e6dec90e am: b692927cfe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117509
Change-Id: Ife7a0290c431c48cbe3e3e1ae625bf9e794a8ae8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 13:47:10 +00:00 |
|
Victor Chang
|
f4a0c5d429
|
Merge changes from topic "icu71" am: cbe922a79b am: e73a4dc9ae
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116805
Change-Id: I0045eb72d4333672a01f57d526561113b9ad5b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 13:19:28 +00:00 |
|
Victor Chang
|
b692927cfe
|
Regenerate LocaleDataTables.cpp due to ICU 71 upgrade am: 593ae0b0c9 am: 37e6dec90e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117509
Change-Id: I7c9e72983161790f166eff33cb574efc11709cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 13:18:48 +00:00 |
|
Victor Chang
|
e73a4dc9ae
|
Merge changes from topic "icu71" am: cbe922a79b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2116805
Change-Id: I5da628f4684c2b650ddb8e38f17610542cad4b22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 12:43:20 +00:00 |
|
Victor Chang
|
37e6dec90e
|
Regenerate LocaleDataTables.cpp due to ICU 71 upgrade am: 593ae0b0c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2117509
Change-Id: I348de14f71af1be8cfb0465564fd87f0f1c23c79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 12:43:13 +00:00 |
|
Victor Chang
|
cbe922a79b
|
Merge changes from topic "icu71"
* changes:
Update DateIntervalFormatTest due to ICU 71 upgrade
Regenerate LocaleDataTables.cpp due to ICU 71 upgrade
|
2022-06-08 12:26:15 +00:00 |
|
Treehugger Robot
|
53b38c1dd8
|
[automerger skipped] Merge "Fix AutofillManager NPE" am: 8032074e61 am: 8b6b4752ff -s ours am: 4d7acb3eba -s ours
am skip reason: Merged-In If56d690882e8d4ad0dba1534f127478089c4d04f with SHA-1 1b57e4cc4c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115080
Change-Id: Ia20dcf6bd7fed59d6f5a93021ae214d22af8f5d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 12:02:55 +00:00 |
|
Treehugger Robot
|
4d7acb3eba
|
[automerger skipped] Merge "Fix AutofillManager NPE" am: 8032074e61 am: 8b6b4752ff -s ours
am skip reason: Merged-In If56d690882e8d4ad0dba1534f127478089c4d04f with SHA-1 1b57e4cc4c is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115080
Change-Id: I916ba7b2b95979a42b17cf0e886374c686ae44f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 11:15:45 +00:00 |
|
Treehugger Robot
|
8b6b4752ff
|
Merge "Fix AutofillManager NPE" am: 8032074e61
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2115080
Change-Id: I13b8fb4699966bfc748b087030f8f25d64bec521
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 10:40:17 +00:00 |
|
Treehugger Robot
|
8032074e61
|
Merge "Fix AutofillManager NPE"
|
2022-06-08 10:14:01 +00:00 |
|
Automerger Merge Worker
|
1d9220c236
|
Merge "[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours am: 3bf325c723 -s ours am: 5a416bea9c -s ours am: 574cb63766 -s ours" into tm-d1-dev-plus-aosp
|
2022-06-08 09:51:47 +00:00 |
|
Adrian Roos
|
c86ab5039a
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours am: 3bf325c723 -s ours am: 5a416bea9c -s ours am: 574cb63766 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: I8348122636ceb25acb408e89b99b3c58a972f701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:51:43 +00:00 |
|
Adrian Roos
|
a63d45fd17
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours am: 3bf325c723 -s ours am: 5a416bea9c -s ours am: 52bdafb703 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: I5c396ba270e78351568ffcf64f862b1c970e960b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:51:39 +00:00 |
|
Automerger Merge Worker
|
ffefc0e3f4
|
Merge "[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours am: 06f9b5d3b5 -s ours am: 1f8941c367 -s ours am: ba093c25f0 -s ours" into tm-d1-dev-plus-aosp
|
2022-06-08 09:51:31 +00:00 |
|
Adrian Roos
|
350423baaa
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours am: 06f9b5d3b5 -s ours am: 1f8941c367 -s ours am: ba093c25f0 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305
Change-Id: Id83c6dd2daaf692eee9c2450523703bf58676b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:51:20 +00:00 |
|
Adrian Roos
|
b3dc7e796e
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours am: 06f9b5d3b5 -s ours am: 1f8941c367 -s ours am: 985c9171dc -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305
Change-Id: Ibf0c6216911af1a6db8da088f602b09e734bcc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:51:15 +00:00 |
|
Adrian Roos
|
574cb63766
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours am: 3bf325c723 -s ours am: 5a416bea9c -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: Ia45c6129d0a3ac7dfa9c5a2bcbf241276286f7d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:34:32 +00:00 |
|
Adrian Roos
|
985c9171dc
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours am: 06f9b5d3b5 -s ours am: 1f8941c367 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305
Change-Id: Ic09deab3fb7bcb2c99fa3b1988b7bf3edb90ad00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:33:56 +00:00 |
|
Adrian Roos
|
52bdafb703
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours am: 3bf325c723 -s ours am: 5a416bea9c -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: I497e9266d410e89a46a40e4bd002cdb36e6d2c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:33:41 +00:00 |
|
Adrian Roos
|
ba093c25f0
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours am: 06f9b5d3b5 -s ours am: 1f8941c367 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305
Change-Id: I20f59ac07ca0003c7439b0217372f9e094841ce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:32:58 +00:00 |
|
Adrian Roos
|
5a416bea9c
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours am: 3bf325c723 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: I0593f7038a72d8862f075ae442eb519a1352bd19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:32:27 +00:00 |
|
Adrian Roos
|
3bf325c723
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours am: dbfa39a262 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: If18c7d6840c651f8855de10e36365f891c5efb3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:15:44 +00:00 |
|
Adrian Roos
|
1f8941c367
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours am: 06f9b5d3b5 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305
Change-Id: I0d96cacebc12d1b01a837384e6d97efacb041be9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 09:06:32 +00:00 |
|
Adrian Roos
|
dbfa39a262
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into qt-dev am: fa1fc20874 am: c2d5e2cb81 -s ours am: 7a57d77f94 -s ours am: ba943db1e3 -s ours am: c8ba614846 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 fd7847b533 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18489968
Change-Id: I7b916c35a774e0c0ffa72658ce9891d5b032d055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:57:59 +00:00 |
|
Adrian Roos
|
55315d12ea
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev am: 4bc778ea49 -s ours am: c166e048b1 -s ours am: df29fca37f -s ours am: b930850863 -s ours am: e9796a800f -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: I1adf62b65117a50ee52f3194d7fdbf3c8eff5390
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:34:23 +00:00 |
|
Automerger Merge Worker
|
9dc3a8c024
|
Merge changes from topic "am-1f298d98da324175bda335053180c31b" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449d4 -s ours am: 9037f3e92f -s ours am: 415faf8952 -s ours am: 92e253a818 -s ours
[automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390 am: 234ac4beeb -s ours am: 3abb4f5610 -s ours am: 58ae8102ff -s ours am: 0ee6691d08 -s ours
|
2022-06-08 08:34:07 +00:00 |
|
Adrian Roos
|
984e739576
|
[automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449d4 -s ours am: 9037f3e92f -s ours am: 415faf8952 -s ours am: 92e253a818 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: Ifcbb453a7ff46dd6daac79fe433c876bca5908cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:33:58 +00:00 |
|
Adrian Roos
|
1618dc26ba
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-dev am: 4bc778ea49 -s ours am: c166e048b1 -s ours am: df29fca37f -s ours am: b930850863 -s ours am: 981a6dc0c8 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: I58e79a107633ae7baa0b0f6578ec6d363e79e7c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:33:53 +00:00 |
|
Adrian Roos
|
c2acfbefae
|
[automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390 am: 234ac4beeb -s ours am: 3abb4f5610 -s ours am: 58ae8102ff -s ours am: 0ee6691d08 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: Id1ab605457ad4af10f7ff4c4d852a0fa818569f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:33:46 +00:00 |
|
Automerger Merge Worker
|
1f0cdbda81
|
Merge changes from topic "am-01ff9a9d19694be48bdbc69db1397dbd" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449d4 -s ours am: 9037f3e92f -s ours am: 415faf8952 -s ours am: 8c61129fa5 -s ours
[automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390 am: 234ac4beeb -s ours am: 3abb4f5610 -s ours am: 58ae8102ff -s ours am: bb4360745c -s ours
|
2022-06-08 08:33:42 +00:00 |
|
Adrian Roos
|
ea16f757a4
|
[automerger skipped] Merge changes from topic "b204906124-sc" into sc-qpr1-dev am: 25967449d4 -s ours am: 9037f3e92f -s ours am: 415faf8952 -s ours am: 8c61129fa5 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: I098a298592f1208be787e0bb64ffee268305735a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:33:28 +00:00 |
|
Adrian Roos
|
978501f47a
|
[automerger skipped] [automerge] Restrict getInputMethodWindowVisibleHeight 2p: 753331b390 am: 234ac4beeb -s ours am: 3abb4f5610 -s ours am: 58ae8102ff -s ours am: bb4360745c -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 2ab01736a6 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16940229
Change-Id: I174c9db45ff53551fe426372728408f3622d307a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:33:19 +00:00 |
|
Automerger Merge Worker
|
3fc56bfeff
|
Merge changes from topic "am-fab4049ffda64cd5920c0666c992abd7" into tm-d1-dev-plus-aosp
* changes:
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-v2-dev am: 1fce20e86e -s ours am: b1bf36ab7e -s ours am: 50a17bc712 -s ours
[automerger skipped] Restrict getInputMethodWindowVisibleHeight am: 2ab01736a6 -s ours am: ba07903512 -s ours am: 5c8d111ab7 -s ours
|
2022-06-08 08:33:14 +00:00 |
|
Adrian Roos
|
6efde6c490
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-v2-dev am: 1fce20e86e -s ours am: b1bf36ab7e -s ours am: 50a17bc712 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 9df1f523f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590705
Change-Id: I7715b7387f7be6c0356b1dbbde027d39a2814489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:32:46 +00:00 |
|
Adrian Roos
|
7d891c6e25
|
[automerger skipped] Restrict getInputMethodWindowVisibleHeight am: 2ab01736a6 -s ours am: ba07903512 -s ours am: 5c8d111ab7 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 9df1f523f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590705
Change-Id: Ie3970090e8921e2d173c8e2e7639cc8f472c2808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:32:41 +00:00 |
|
Adrian Roos
|
7d8144a19c
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into sc-v2-dev am: 1fce20e86e -s ours am: b1bf36ab7e -s ours am: 82d9c901d9 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 9df1f523f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590705
Change-Id: I0f1a63fd2176f5cb86ef8217654ef9f65ec1bfe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:32:39 +00:00 |
|
Adrian Roos
|
a6792c26d8
|
[automerger skipped] Restrict getInputMethodWindowVisibleHeight am: 2ab01736a6 -s ours am: ba07903512 -s ours am: d080a83371 -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 9df1f523f1 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18590705
Change-Id: I7d4d0c6a1f80670efd7e21185ae17ca200f1e56e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:32:32 +00:00 |
|
Adrian Roos
|
06f9b5d3b5
|
[automerger skipped] Merge "Restrict getInputMethodWindowVisibleHeight" into rvc-dev am: 31e8959439 am: a89cdcefab -s ours am: b55f60342e -s ours am: 617aa519be -s ours
am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b390 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18492305
Change-Id: I585332631560e95222fca628a05a3e88fa45e374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2022-06-08 08:32:29 +00:00 |
|