Commit Graph

706233 Commits

Author SHA1 Message Date
TreeHugger Robot
8aaf29decc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours am: e65c9f583b -s ours am: c6d349cc92 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: Ic26f3ff44961f2750550d00996e571f07b9362f4
2021-07-31 02:42:35 +00:00
Jack He
80893172bf Merge "Broadcast Bluetooth state to OFF properly" into sc-dev am: cd9340419a am: ea9b063ab4 am: f942befe2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433382

Change-Id: I951dd8b53ff90826235d0c14e45bb0c67bf9be3b
2021-07-31 02:42:25 +00:00
TreeHugger Robot
7991da9ae9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours am: 889a6c48ee -s ours am: 80035c6b38 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: If64901decf22549aa3ea1991fdd1ceb886c0911c
2021-07-31 02:41:48 +00:00
Jack He
3d4897a6d7 Merge "Broadcast Bluetooth state to OFF properly" into sc-dev am: cd9340419a am: 2c65f345a3 am: 1162f4ca38
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433382

Change-Id: I4c553c9d63d66ec9a5c2f64020799af3440d24f2
2021-07-31 02:41:37 +00:00
TreeHugger Robot
7674899d15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours am: 78cfd906ac -s ours am: e536ddde3e -s ours am: 39890e6592 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: Ic90aa02c4650ca913c8d1d906980cc4de037c4dd
2021-07-31 02:41:09 +00:00
TreeHugger Robot
155f86ec3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours am: 78cfd906ac -s ours am: e5614b9160 -s ours am: 23138a052a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: I23b26b02933dfcded175a1336e8416b38468caaa
2021-07-31 02:40:55 +00:00
TreeHugger Robot
c6d349cc92 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours am: e65c9f583b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: Icd0803fda112e21fdbc006b15ce7f5d4b095b57c
2021-07-31 02:31:00 +00:00
Jack He
f942befe2b Merge "Broadcast Bluetooth state to OFF properly" into sc-dev am: cd9340419a am: ea9b063ab4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433382

Change-Id: I1f3d74e35b934b8c8c4653cf8e9561d10fee4c89
2021-07-31 02:30:51 +00:00
TreeHugger Robot
d5809cdf38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours am: 447b5b175c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: Idcc8847e2e2e80266a90e9d1986455c8678ed6cb
2021-07-31 02:30:49 +00:00
TreeHugger Robot
80035c6b38 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours am: 889a6c48ee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: I21ff6954267f00ad1969aa9b403d6e6fddb1d132
2021-07-31 02:30:43 +00:00
Jack He
1162f4ca38 Merge "Broadcast Bluetooth state to OFF properly" into sc-dev am: cd9340419a am: 2c65f345a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433382

Change-Id: I037de24dd4fb48c885857f239511e2c49c326b76
2021-07-31 02:30:37 +00:00
Jack He
3451d7f612 Merge "Broadcast Bluetooth state to OFF properly" into sc-dev am: cd9340419a am: e4824c3166
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433382

Change-Id: I7be1120d99f6d0fb5a9a8c30e10c987f8c3d6af0
2021-07-31 02:30:36 +00:00
TreeHugger Robot
39890e6592 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours am: 78cfd906ac -s ours am: e536ddde3e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: I81d1b23f0c69fdada032f5d13c59d23cc3cd86c5
2021-07-31 02:30:21 +00:00
TreeHugger Robot
23138a052a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours am: 78cfd906ac -s ours am: e5614b9160 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: Ie1ccdfc7858da4781a397c5145526645bf48cff7
2021-07-31 02:30:00 +00:00
TreeHugger Robot
d22937c727 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours am: 78cfd906ac -s ours am: 94a8e1c6ff -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: Ie9cefcf6cae6f85f8821cafdfd7fd243d2c34765
2021-07-31 02:29:51 +00:00
TreeHugger Robot
fe73efa414 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: e07962ff77 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433236

Change-Id: Ifbe8538660cff7f39c929cb99904f05e7f9e700c
2021-07-31 02:29:37 +00:00
TreeHugger Robot
447b5b175c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: I2c0f46a33af3dd501bdd03f294230cdb38a97c62
2021-07-31 02:21:36 +00:00
Jack He
e4824c3166 Merge "Broadcast Bluetooth state to OFF properly" into sc-dev am: cd9340419a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433382

Change-Id: I19b9fab83a42c34b2ccd9fe0a88d3e75cc109ffb
2021-07-31 02:21:31 +00:00
TreeHugger Robot
94a8e1c6ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours am: 78cfd906ac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: I892eba1cf2cab65a4f60e83cce32676974515027
2021-07-31 02:21:21 +00:00
TreeHugger Robot
889a6c48ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: Ia5a96baf2e0de3c65bd85bcbb7d07726621f7d77
2021-07-31 02:21:17 +00:00
TreeHugger Robot
e65c9f583b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours am: b5eba64c2e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: Idef2792bcfa36a5b00954b8216d4a648e2183694
2021-07-31 02:18:14 +00:00
Jack He
ea9b063ab4 Merge "Broadcast Bluetooth state to OFF properly" into sc-dev am: cd9340419a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433382

Change-Id: I50c16129177a0d0a8214a1dcf271bfab08bfb09e
2021-07-31 02:18:08 +00:00
TreeHugger Robot
e5614b9160 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours am: 78cfd906ac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: I18fe89fcceccb926bff4cc8388319cebf03d36db
2021-07-31 02:18:03 +00:00
TreeHugger Robot
b5eba64c2e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 9bf0c45e6d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433532

Change-Id: Ib87a8128aee7d043d1ee95793a0a12e077bc528c
2021-07-31 02:17:39 +00:00
Jack He
2c65f345a3 Merge "Broadcast Bluetooth state to OFF properly" into sc-dev am: cd9340419a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433382

Change-Id: Ibb2e2cddaf17c84c0d2e0a654448daf09815e849
2021-07-31 02:17:36 +00:00
TreeHugger Robot
24b7cf255c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 987b185136 -s ours am: 4d0aa4d511 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433375

Change-Id: Ice61250ade9b26a3daf65f6af4732ffc34383e9e
2021-07-31 02:17:30 +00:00
TreeHugger Robot
e536ddde3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours am: 78cfd906ac -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: Ic68ce24bf025a5799b91347ad0ab4fadff9b6a6d
2021-07-31 02:17:14 +00:00
TreeHugger Robot
e07962ff77 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-07-31 02:16:31 +00:00
Jack He
cd9340419a Merge "Broadcast Bluetooth state to OFF properly" into sc-dev 2021-07-31 02:08:17 +00:00
TreeHugger Robot
78cfd906ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: d3552ecc9c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433371

Change-Id: Ib15582507e35ecfc1d55a7c4ed56b888eed8aeda
2021-07-31 02:04:31 +00:00
TreeHugger Robot
9bf0c45e6d Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-07-31 02:01:01 +00:00
TreeHugger Robot
4d0aa4d511 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 987b185136 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433375

Change-Id: I24858df5302de0494be630c672e786689aaec8ce
2021-07-31 01:59:58 +00:00
TreeHugger Robot
d3552ecc9c Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-07-31 01:54:30 +00:00
TreeHugger Robot
987b185136 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-07-31 01:45:35 +00:00
Bill Yi
83154debaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours am: 860163c059 -s ours am: 8fc6b595fe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138

Change-Id: Idf31b7b5872c254a5faa4f658e479af356d41fb6
2021-07-31 01:23:19 +00:00
Bill Yi
8414412f10 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours am: 89a8f1f216 -s ours am: aa5f80e378 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138

Change-Id: Ia9b5c28f88b22ba680ee377c56d555ad3e60e011
2021-07-31 01:22:53 +00:00
Bill Yi
8fc6b595fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours am: 860163c059 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138

Change-Id: Ia679bc9e1b1c8d908cb519c9be0838a2c46976c1
2021-07-31 01:15:25 +00:00
Bill Yi
aa5f80e378 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours am: 89a8f1f216 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138

Change-Id: I74e852f114c4d7da99549f06cabf21b9d605270f
2021-07-31 01:14:58 +00:00
Bill Yi
fe8458f84b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours am: 8e177c42b0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138

Change-Id: Ibbc1eadc9d348e5b2499cc162083efd90a8a2671
2021-07-31 01:14:39 +00:00
Bill Yi
89a8f1f216 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138

Change-Id: I658fb3cb343b153c5ed4fdc476fdf6898308a9fd
2021-07-31 01:02:26 +00:00
Bill Yi
860163c059 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138

Change-Id: I6f3a8f219f2df223c470749218d40c883d58a28f
2021-07-31 01:01:38 +00:00
Bill Yi
8e177c42b0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 4c215007cf -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15429138

Change-Id: I3193e4b03890148e90c3e2ec7ad4de2a3197730c
2021-07-31 01:01:38 +00:00
Josh Yang
bf649b323a Merge "Add a new API to control task snapshot behavior." 2021-07-31 00:57:39 +00:00
Automerger Merge Worker
f2d092eca5 Merge "Merge "Replace 'use fingerprint to open'" into sc-dev am: bafe3db841 am: f6b9659566" into sc-v2-dev-plus-aosp am: a3be4a0add
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15421556

Change-Id: Id4d6e9ef216597546c6c86070185b16210cacf6e
2021-07-31 00:57:29 +00:00
Automerger Merge Worker
21a5342ebc Merge "Merge "Replace 'use fingerprint to open'" into sc-dev am: bafe3db841 am: 04ca9295d4" into sc-v2-dev-plus-aosp am: dd5988eddb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15421556

Change-Id: I919934b975d5b7b7c7c82ff8b2cfcfe6e438aa80
2021-07-31 00:57:07 +00:00
Automerger Merge Worker
af02bc80b1 Merge "Merge "Fix condition where FP would require confirmation" into sc-dev am: c52f2f069f am: 0ccccb8cff" into sc-v2-dev-plus-aosp am: b74b1bee75
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413720

Change-Id: Ibbe27b0a46c83c137a138a555ddd09049a2264be
2021-07-31 00:56:22 +00:00
Kevin Chyn
4d0dacd196 Merge "Fix condition where FP would require confirmation" into sc-dev am: c52f2f069f am: 975ca3239f am: 76c8728469
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15413720

Change-Id: Ia307e2fcef79290b64135ae5c3001eb807abb430
2021-07-31 00:55:43 +00:00
Bill Yi
4c215007cf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-07-31 00:51:30 +00:00
Bill Yi
df8cb071d2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-07-31 00:51:13 +00:00
Automerger Merge Worker
a3be4a0add Merge "Merge "Replace 'use fingerprint to open'" into sc-dev am: bafe3db841 am: f6b9659566" into sc-v2-dev-plus-aosp 2021-07-31 00:45:37 +00:00