TreeHugger Robot
|
bec17ff53d
|
Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into sc-qpr1-dev am: 4d4af2e2cf am: d1ea118441
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061898
Change-Id: I29825e05bac8196dccbe26844118697a277d91b0
|
2022-03-03 11:03:29 +00:00 |
|
Bill Yi
|
a31350883a
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6 am: a16c2cac55 -s ours am: 0fb61ed319 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061898
Change-Id: I327d49d1c174fa5f1aae0d75ded53a2c1d7969fa
|
2022-03-03 11:03:15 +00:00 |
|
TreeHugger Robot
|
d1ea118441
|
Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into sc-qpr1-dev am: 4d4af2e2cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061898
Change-Id: I079ea3eb1102128d7a4059008884b5f15ed85b08
|
2022-03-03 10:32:00 +00:00 |
|
Bill Yi
|
0fb61ed319
|
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6 am: a16c2cac55 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061898
Change-Id: I12fff499ce413e52d91517427d52d39571e56b38
|
2022-03-03 10:31:53 +00:00 |
|
TreeHugger Robot
|
4d4af2e2cf
|
Merge changes from topic "presubmit-am-968cbcd5476f472fb5e00f482b10bff2" into sc-qpr1-dev
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6
Import translations. DO NOT MERGE ANYWHERE
|
2022-03-03 10:08:40 +00:00 |
|
TreeHugger Robot
|
f4dbb096f1
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e0647b9540 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17062829
Change-Id: Ibab56362fdb93ce85495e36befa0c34d8e467ae2
|
2022-03-03 10:06:50 +00:00 |
|
TreeHugger Robot
|
e0647b9540
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
|
2022-03-03 09:11:39 +00:00 |
|
TreeHugger Robot
|
d22eaf68e3
|
Merge changes from topic "presubmit-am-58188ae3ac814c1f9143426693ab3d03" into sc-v2-dev-plus-aosp
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 86fdb807af
Import translations. DO NOT MERGE ANYWHERE
|
2022-03-03 09:11:39 +00:00 |
|
TreeHugger Robot
|
af26d37b32
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cd54d570be -s ours am: 02e0f62b17 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17063143
Change-Id: I5a4b00f72eca66da153d9a6fb734214a3efbb212
|
2022-03-03 08:28:02 +00:00 |
|
Bill Yi
|
1d6c1a440f
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eee138e509 -s ours am: 6b0e3816fd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17063143
Change-Id: Ic204b02837968bfbbdc59ec68922716df402a050
|
2022-03-03 08:27:54 +00:00 |
|
TreeHugger Robot
|
02e0f62b17
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: cd54d570be -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17063143
Change-Id: I1379cf17682dea516334db62fa2191462b1d4731
|
2022-03-03 08:07:51 +00:00 |
|
Bill Yi
|
6b0e3816fd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eee138e509 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17063143
Change-Id: I19e237266840a3a6c27c907f4c3fbf0828ce44d7
|
2022-03-03 08:07:42 +00:00 |
|
TreeHugger Robot
|
cd54d570be
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
|
2022-03-03 07:44:01 +00:00 |
|
Bill Yi
|
65548aaa11
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 86fdb807af
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17062829
Change-Id: I6905e6310cba6d76b713087c493d96999ec8a0a6
|
2022-03-03 04:26:50 +00:00 |
|
Bill Yi
|
86fdb807af
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id893507394fb40f8f67e5eea55edab24c48fc10a
|
2022-03-03 04:25:10 +00:00 |
|
Bill Yi
|
eee138e509
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib1db7d70f4bee2fbaa3b77a703360e7fd0adba4c
|
2022-03-03 04:21:16 +00:00 |
|
Bill Yi
|
a16c2cac55
|
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 0100caf6e6
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061898
Change-Id: I7736abc6344b139c65332bd0c3c0820bc717136c
|
2022-03-03 04:19:08 +00:00 |
|
Bill Yi
|
0100caf6e6
|
Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I1ed2539796ffc3b8479a9f1a7dabb4f7e1c435b1
|
2022-03-03 04:17:29 +00:00 |
|
Treehugger Robot
|
75e156e2c5
|
Merge "Correct volume control symbol for BLE" am: 200dfd387f am: 50987acb5b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990331
Change-Id: I21844add8be8b0deeda87f399d46b9d4868b31e0
|
2022-03-03 03:17:01 +00:00 |
|
Treehugger Robot
|
c65ee54bcb
|
Merge "Add an optional extra field description for ACTION_CHANGE_DEFAULT" am: 2b65ebc340 am: 8f7978d676
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000590
Change-Id: I295b0965a6949ebaa377447b892aa1a776f86965
|
2022-03-03 03:16:27 +00:00 |
|
Frank Li
|
f905585fa7
|
Merge "[MS68.3] Address comments at aosp/1958144" am: 411168d77b am: ecab80fe20
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964907
Change-Id: I40d19595dcc5673f632ffcbca1b855ce124c2561
|
2022-03-03 03:16:12 +00:00 |
|
Treehugger Robot
|
50987acb5b
|
Merge "Correct volume control symbol for BLE" am: 200dfd387f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990331
Change-Id: I4182d4e7287c174227deac52e7141897191c9b0e
|
2022-03-03 02:55:29 +00:00 |
|
Treehugger Robot
|
8f7978d676
|
Merge "Add an optional extra field description for ACTION_CHANGE_DEFAULT" am: 2b65ebc340
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2000590
Change-Id: Icfcf52f3055d4983ba8960d6b653766ab6176677
|
2022-03-03 02:55:10 +00:00 |
|
Frank Li
|
ecab80fe20
|
Merge "[MS68.3] Address comments at aosp/1958144" am: 411168d77b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1964907
Change-Id: Idd8ef239098fe5806d099e9392662479dfedebbc
|
2022-03-03 02:54:44 +00:00 |
|
Treehugger Robot
|
200dfd387f
|
Merge "Correct volume control symbol for BLE"
|
2022-03-03 02:50:15 +00:00 |
|
Treehugger Robot
|
2b65ebc340
|
Merge "Add an optional extra field description for ACTION_CHANGE_DEFAULT"
|
2022-03-03 02:34:41 +00:00 |
|
Frank Li
|
411168d77b
|
Merge "[MS68.3] Address comments at aosp/1958144"
|
2022-03-03 02:26:53 +00:00 |
|
Julia Reynolds
|
4ec15391c8
|
[automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: 178be83f51 -s ours am: d97b8a0aec -s ours
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873520
Change-Id: I2ca0689feca01711e83dbfb87659172efd8885d9
|
2022-03-03 01:56:43 +00:00 |
|
Julia Reynolds
|
d97b8a0aec
|
[automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours am: 178be83f51 -s ours
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873520
Change-Id: I648912d92550081e0c2fc6fa11070ae5b8925984
|
2022-03-03 01:24:17 +00:00 |
|
Chiachang Wang
|
590305ed33
|
Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202 am: 8344626eba
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334
Change-Id: I791ae3f49e58c36eea2b3e5f31d5e2b717f458e6
|
2022-03-03 01:02:56 +00:00 |
|
Julia Reynolds
|
178be83f51
|
[automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours am: 5a1cf350e6 -s ours
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873520
Change-Id: Id4db8ac4e42fdaff6d3c828c6a81efd23a86d409
|
2022-03-03 01:02:50 +00:00 |
|
Chiachang Wang
|
8344626eba
|
Merge "Rename getRequiresInternetValidation to isInternetValidationRequired" am: d734ce3202
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1990334
Change-Id: I9e2a7e483544967ac89052ece6e3f1ed058835f0
|
2022-03-03 00:41:11 +00:00 |
|
Julia Reynolds
|
5a1cf350e6
|
[automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours am: 3837076d84 -s ours
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873520
Change-Id: Id2134db32f8b4f3fb07badef43ce0932e8dcd654
|
2022-03-03 00:40:22 +00:00 |
|
Julia Reynolds
|
3837076d84
|
[automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours am: c6e84150fa -s ours
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873520
Change-Id: Ic580d121962d8dc16006587c1bab71e49f35aecf
|
2022-03-03 00:19:11 +00:00 |
|
Chiachang Wang
|
d734ce3202
|
Merge "Rename getRequiresInternetValidation to isInternetValidationRequired"
|
2022-03-03 00:10:54 +00:00 |
|
Julia Reynolds
|
c6e84150fa
|
[automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours am: e749344386 -s ours
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873520
Change-Id: I4c10dba86fd3bd50268060f5ac96e3877f63ec07
|
2022-03-02 23:56:41 +00:00 |
|
Julia Reynolds
|
e749344386
|
[automerger skipped] Filter notification APIs by user am: 4d7ca1dbce -s ours
am skip reason: skipped by user juliacr
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873520
Change-Id: I329ef6cde3dff1ee646f39507e3a487472948c93
|
2022-03-02 23:35:43 +00:00 |
|
Treehugger Robot
|
c094181aa0
|
Merge "Fix LicenseHtmlGeneratorFromXml miss files header" am: 0239107ed5 am: 1a480d9759
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005491
Change-Id: I09f2aeaf28db214e28afc557e7611013487b43dd
|
2022-03-02 22:31:53 +00:00 |
|
Treehugger Robot
|
1a480d9759
|
Merge "Fix LicenseHtmlGeneratorFromXml miss files header" am: 0239107ed5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2005491
Change-Id: Iad2d1f493d8f7185d7a8a4015dbbbae2bdc4959e
|
2022-03-02 22:09:56 +00:00 |
|
Treehugger Robot
|
0239107ed5
|
Merge "Fix LicenseHtmlGeneratorFromXml miss files header"
|
2022-03-02 21:44:33 +00:00 |
|
Josh Tsuji
|
1706cecb25
|
Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev am: 0d8f1067a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17005881
Change-Id: I0a33a1eaec23cc4af8a5cce549ea7faba4e55a85
|
2022-03-02 21:36:49 +00:00 |
|
Josh Tsuji
|
0d8f1067a4
|
Merge "Don't re-hide the keyguard if it isn't showing." into sc-v2-dev
|
2022-03-02 21:17:23 +00:00 |
|
Josh Tsuji
|
49ededb26d
|
Merge changes from topic "presubmit-am-6bd2dc4c86ff420f9becf1b089e962a7" into sc-v2-dev-plus-aosp
* changes:
[automerge] Don't re-hide the keyguard if it isn't showing. 2p: c3a2eeaed3
Don't re-hide the keyguard if it isn't showing.
|
2022-03-02 21:17:23 +00:00 |
|
TreeHugger Robot
|
a53e794051
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-dev am: b4ed0a3467 -s ours am: 9aeec3e862 -s ours am: 8165fee91d -s ours am: a5cdfa690b -s ours am: f167945b56 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: Idd6dc73eb8a9def031c082e1130816ca9bdf7033
|
2022-03-02 20:16:30 +00:00 |
|
Julia Reynolds
|
2176716195
|
[automerger skipped] Filter notification APIs by user am: 3456555b7c -s ours am: 4372e063b7 -s ours am: a905b405bf -s ours am: 0ae8eee99e -s ours am: a02879a15e -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: I58ca83cf086b9171c00d8e45085d16c349692c43
|
2022-03-02 20:16:17 +00:00 |
|
TreeHugger Robot
|
08b798aeaa
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-qpr-dev am: 0ffd60007c -s ours am: 2dfb7bbbed -s ours am: 0e8c0d8b0e -s ours am: 14a350285e -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: I21445628a35c9ea7d987a60325aab3f180a4ac1f
|
2022-03-02 20:15:45 +00:00 |
|
Julia Reynolds
|
9272235ee3
|
[automerger skipped] Filter notification APIs by user am: 24076b8571 -s ours am: ed4b77dbcf -s ours am: fca61e4b86 -s ours am: 2b395251c1 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873353
Change-Id: I35bffd7ee56640313df5fef65ef16272fc29d837
|
2022-03-02 20:15:26 +00:00 |
|
TreeHugger Robot
|
bde1eae8b5
|
[automerger skipped] Merge "Filter notification APIs by user" into sc-dev am: 1db370eac3 -s ours am: e127a68093 -s ours am: 308ed847d4 -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 40ca868ca5 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873352
Change-Id: Ice20f16742175049a8a4adc1532f2214287ed627
|
2022-03-02 20:14:52 +00:00 |
|
TreeHugger Robot
|
f167945b56
|
[automerger skipped] Merge "Filter notification APIs by user" into rvc-dev am: b4ed0a3467 -s ours am: 9aeec3e862 -s ours am: 8165fee91d -s ours am: a5cdfa690b -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: I26c3fb2b125d0033eb9df1ff973d7935a54e0a22
|
2022-03-02 19:54:37 +00:00 |
|
Julia Reynolds
|
a02879a15e
|
[automerger skipped] Filter notification APIs by user am: 3456555b7c -s ours am: 4372e063b7 -s ours am: a905b405bf -s ours am: 0ae8eee99e -s ours
am skip reason: Merged-In I2eba0a592fa33ed25e1ac3919f1b2631e5db4258 with SHA-1 24076b8571 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16873394
Change-Id: I958a13dd082a9fc162e84beb07cd1bc752adad22
|
2022-03-02 19:54:35 +00:00 |
|