Commit Graph

654180 Commits

Author SHA1 Message Date
TreeHugger Robot
03c0f1c012 Merge "Update udfps AOD icon" into sc-dev am: fbf9a2634c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15500384

Change-Id: I2a09387f785b91758002bba3b5c20bf0bbf06683
2021-08-10 19:33:37 +00:00
TreeHugger Robot
b88ec0ad1c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46da446809 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaeb1666fadb3f219900fbd76321fde7b7a448837
2021-08-10 19:33:19 +00:00
TreeHugger Robot
4f094926bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 177e73216a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I52abf14c77cf3b272607867ab59368359c2ba270
2021-08-10 19:33:09 +00:00
TreeHugger Robot
ddf08527ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8dd449cee4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4825d508b103e51e766d9814f9d92ef2e2cebd8a
2021-08-10 19:33:01 +00:00
TreeHugger Robot
581ce0a2aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d9c0e6992d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I472283af4c500576474784f0875510a11acf2e1b
2021-08-10 19:32:57 +00:00
TreeHugger Robot
9bc82fed67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ff33c17f8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I13b2b222b9be2702dceede521a317460e28965b7
2021-08-10 19:32:49 +00:00
TreeHugger Robot
93e0c269af Merge "Update udfps AOD icon" into sc-dev am: fbf9a2634c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15500384

Change-Id: Ib0ee59d3852f026e5270b396f2e0d7c449c479d7
2021-08-10 19:32:49 +00:00
TreeHugger Robot
07a2913428 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46da446809 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1935fa0a2f34edeb07dcf7d210902559b5c3bcd
2021-08-10 19:32:42 +00:00
TreeHugger Robot
94a0cf2aea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0421f6c653 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5480cd51e5a4d0cb709eebfece1afc7f616b825d
2021-08-10 19:32:38 +00:00
TreeHugger Robot
df74ed8fe6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 177e73216a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id76fbb918a928b7a8fb459880d5ab51a351d077a
2021-08-10 19:32:28 +00:00
TreeHugger Robot
79405cd9d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 8dd449cee4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I59c676efc57a7bebe1fae0ae524dd72a10a24dc0
2021-08-10 19:32:16 +00:00
TreeHugger Robot
d52ff8d1f2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edd4b154f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98b893a115c5c69b6945f403f89bf5fd0857c16f
2021-08-10 19:32:11 +00:00
TreeHugger Robot
52b1ce3c9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: d9c0e6992d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I643e2c1826f28029f3ba970dab968747923bbccf
2021-08-10 19:32:02 +00:00
TreeHugger Robot
64557dfbde [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: ff33c17f8e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I32ca9ff4628f82cf11cae853cab4ecf25d012ca8
2021-08-10 19:31:51 +00:00
TreeHugger Robot
ad6e40f073 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0421f6c653 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibcc1ccbe2942758f5ea785c0be6b9bcb1e132974
2021-08-10 19:31:38 +00:00
Dave Mankoff
804799ae8a [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours am: 6db47d2d58 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: If3dd19e9e31586eb5e63c87045016f8aa17c4a1b
2021-08-10 19:31:18 +00:00
TreeHugger Robot
c56c5cf2d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: edd4b154f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica2147e36b4f1d4bb25a394706b459c60010def0
2021-08-10 19:31:13 +00:00
Dave Mankoff
5a382b6915 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 90824714b5 is already in history

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

Change-Id: I5456f1058281600aa81241000d2a5e8530815126
2021-08-10 19:31:00 +00:00
TreeHugger Robot
fbf9a2634c Merge "Update udfps AOD icon" into sc-dev 2021-08-10 19:28:48 +00:00
TreeHugger Robot
46da446809 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:25:50 +00:00
TreeHugger Robot
177e73216a Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:24:14 +00:00
TreeHugger Robot
8dd449cee4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:24:11 +00:00
TreeHugger Robot
262de4fb4f Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:24:09 +00:00
TreeHugger Robot
5f7ad43cdf Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:23:56 +00:00
TreeHugger Robot
d9c0e6992d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:23:53 +00:00
TreeHugger Robot
ff33c17f8e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:23:47 +00:00
TreeHugger Robot
0421f6c653 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:23:44 +00:00
TreeHugger Robot
40cb9ed9c1 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:23:24 +00:00
TreeHugger Robot
0cab7eb1f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:20:49 +00:00
TreeHugger Robot
edd4b154f4 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-10 19:20:06 +00:00
TreeHugger Robot
a319964f46 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-10 19:19:24 +00:00
Dave Mankoff
6db47d2d58 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours am: 47d2f291e3 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I31df5dd17183ecaf75a8ee8c0a64b201dc29992b
2021-08-10 19:19:20 +00:00
Dave Mankoff
47d2f291e3 [automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev am: 15336c87fa -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 55cd8952c0 is already in history

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

Change-Id: I2ae8d9dadf42dea7071e2ac23f00d4ed3333660d
2021-08-10 19:11:47 +00:00
Dave Mankoff
0122320cb2 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15358519

Change-Id: Ic923b993f8bff5b5fa2c5f32f91e4787b8c21e18
2021-08-10 19:11:11 +00:00
Treehugger Robot
5ca3132389 Merge "Add new API to notify CallRedirectionService timed out." am: 5a5c3d7562 am: 423dd00f7f am: 811de5db8c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782287

Change-Id: Ia5da76bb30d757c46f679d598b3bcebe6000d198
2021-08-10 19:11:09 +00:00
TreeHugger Robot
7396bb9227 Merge "Log locations received by default and add javadocs" into sc-dev am: 35260c6f60 am: 109efa3639
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15517616

Change-Id: Ia67dce5c35e952c9bf3e98400f34aa40604a0267
2021-08-10 19:08:16 +00:00
Joe Bolinger
503aab45a8 Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev am: 9259969bf2 am: 8e5fbe32b8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15505425

Change-Id: I61ae602901ead7d6aeb6e812e7c4485a6770d392
2021-08-10 19:07:54 +00:00
Treehugger Robot
811de5db8c Merge "Add new API to notify CallRedirectionService timed out." am: 5a5c3d7562 am: 423dd00f7f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782287

Change-Id: I44f952574d81b1ce6cc8d0f1c1e82d638c7fc558
2021-08-10 19:07:40 +00:00
TreeHugger Robot
8af054814b Merge "Log locations received by default and add javadocs" into sc-dev am: 35260c6f60 am: a94ecb5baa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15517616

Change-Id: If8c20bc5c026a36bb1af1e009c9f3a2ea72fc083
2021-08-10 19:07:17 +00:00
Joe Bolinger
e4bfcd7383 Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev am: 9259969bf2 am: d93392c4d2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15505425

Change-Id: I20219b00b43f6728ef66769903374013df7bf89c
2021-08-10 19:07:03 +00:00
Dave Mankoff
15336c87fa Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into pi-dev 2021-08-10 18:58:52 +00:00
Dave Mankoff
b279744b70 Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev 2021-08-10 18:58:36 +00:00
TreeHugger Robot
109efa3639 Merge "Log locations received by default and add javadocs" into sc-dev am: 35260c6f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15517616

Change-Id: Ia3c464ab89147e28cdd32d0cc2d6a1d7da73a32f
2021-08-10 18:50:49 +00:00
Joe Bolinger
8e5fbe32b8 Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev am: 9259969bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15505425

Change-Id: I5179ecd978c9b4d229a9cafee55b83fb317e17a0
2021-08-10 18:50:45 +00:00
Treehugger Robot
423dd00f7f Merge "Add new API to notify CallRedirectionService timed out." am: 5a5c3d7562
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1782287

Change-Id: I8eeb95915b9b8f7dd66bf0e9bc16b0333f09b77b
2021-08-10 18:50:25 +00:00
TreeHugger Robot
a94ecb5baa Merge "Log locations received by default and add javadocs" into sc-dev am: 35260c6f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15517616

Change-Id: I1d399457af3deecec1993feef739f0236c72d12e
2021-08-10 18:50:11 +00:00
Joe Bolinger
d93392c4d2 Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev am: 9259969bf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15505425

Change-Id: I69f68b87fdf4086e4a7587e8f485f659c377be14
2021-08-10 18:49:44 +00:00
Treehugger Robot
5a5c3d7562 Merge "Add new API to notify CallRedirectionService timed out." 2021-08-10 18:38:14 +00:00
TreeHugger Robot
35260c6f60 Merge "Log locations received by default and add javadocs" into sc-dev 2021-08-10 18:38:06 +00:00
Joe Bolinger
9259969bf2 Merge "Add detailed fingerprint logging and a historical buffer." into sc-dev 2021-08-10 18:36:46 +00:00