Sudheer Shanka
|
f4bcd80404
|
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours am: 5a215b12a2 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301702
Change-Id: I6c9b9364f216a7f8d79092d08ef26d453773ab94
|
2021-08-11 02:52:23 +00:00 |
|
Sudheer Shanka
|
5a215b12a2
|
[automerger skipped] Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev am: 8ec1b12371 -s ours
am skip reason: Merged-In I65b2e96ff1230b2051dd1e5bd9c21e5ba3e1146a with SHA-1 a22e341ac2 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15301702
Change-Id: If94c8cc284ce2ef680fda35412ce7b145883374f
|
2021-08-11 02:34:52 +00:00 |
|
Sudheer Shanka
|
8ec1b12371
|
Merge "Add SafetyNet logging if a certain broadcast is received by apps." into rvc-qpr-dev
|
2021-08-11 02:24:48 +00:00 |
|
TreeHugger Robot
|
07b2ff7a54
|
Merge "Fix Location equals()" into sc-dev am: b42181c3be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010
Change-Id: I3d5846d248f0f00c507fd3854ddc5a90a0b85277
|
2021-08-11 02:07:39 +00:00 |
|
TreeHugger Robot
|
b42181c3be
|
Merge "Fix Location equals()" into sc-dev
|
2021-08-11 01:52:31 +00:00 |
|
Sudheer Shanka
|
69f41f8378
|
[automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev am: a5168b973f -s ours am: 49059eafae -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 1494979a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15053178
Change-Id: I5cdd14d7259a7bd5223f664f27df2bbc608b34a8
|
2021-08-11 01:40:42 +00:00 |
|
Sudheer Shanka
|
49059eafae
|
[automerger skipped] Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev am: a5168b973f -s ours
am skip reason: Merged-In I11d736771d859d2af27d5c84a502ab038974e2e2 with SHA-1 1494979a6a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15053178
Change-Id: I75ed537f04544b8f454abca95c7e25d9e2b05448
|
2021-08-11 01:22:40 +00:00 |
|
Sudheer Shanka
|
a5168b973f
|
Merge "Send targeted broadcasts to prevent other apps from receiving them." into rvc-qpr-dev
|
2021-08-11 01:09:08 +00:00 |
|
Automerger Merge Worker
|
18671436c2
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 6ec148e202 -s ours am: 4d380e273b -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I865f09cdd3fad4bafd69d4a6f762c02bf41abfaf
|
2021-08-10 23:34:40 +00:00 |
|
Dave Mankoff
|
f3cf4a43ee
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 3806a2a28f -s ours am: 7d6482b4b1 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I7e8b087c739d0822d8bbbfeadb9d6257b891dc59
|
2021-08-10 23:34:29 +00:00 |
|
Automerger Merge Worker
|
21877a9eec
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours am: 4bc1c08af1 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I7ca7279c30beb61a40e333d150ce86628ce9b4a5
|
2021-08-10 23:34:15 +00:00 |
|
Dave Mankoff
|
45330c3e7d
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours am: eb8b442022 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: Ie4fd112a13f5a1fddd097509365d362470bdb87b
|
2021-08-10 23:33:44 +00:00 |
|
Automerger Merge Worker
|
4d380e273b
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 6ec148e202 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: Ib120963304d43799c1141696832645802a3d7411
|
2021-08-10 23:28:03 +00:00 |
|
Dave Mankoff
|
7d6482b4b1
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 3806a2a28f -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I476d3652c195ec7832f8333fb2c6a920b22992d7
|
2021-08-10 23:26:51 +00:00 |
|
Automerger Merge Worker
|
4bc1c08af1
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours am: 26c8f8d054 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I664e04e4f05c9ef94728f2d2b7890ba7892d3be2
|
2021-08-10 23:21:31 +00:00 |
|
Dave Mankoff
|
eb8b442022
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours am: 671263bccd -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I87bc72724f3c6b876a6423d1b932c5bac84a6953
|
2021-08-10 23:20:59 +00:00 |
|
Automerger Merge Worker
|
6ec148e202
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I1d90bcc705ccbb05ba04d5f3634ee4c25fb546ff
|
2021-08-10 23:11:13 +00:00 |
|
Dave Mankoff
|
3806a2a28f
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I6e4ecf1c8e4bea85ef3c2f992a57f2043bfc01ec
|
2021-08-10 23:11:03 +00:00 |
|
Automerger Merge Worker
|
26c8f8d054
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours am: 0fe296d677 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I14648f534f8c1be5bdc5b6bb7c4fd176391cc6a9
|
2021-08-10 23:10:44 +00:00 |
|
Dave Mankoff
|
671263bccd
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours am: cd5bad2480 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I132c5c5f55dd2426bd194df7ea871801e3e7cce4
|
2021-08-10 23:10:24 +00:00 |
|
Automerger Merge Worker
|
0fe296d677
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours am: 50c7797637 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: Ia67b2944593244b543ac1a6b1a79756a54721e01
|
2021-08-10 22:57:58 +00:00 |
|
Dave Mankoff
|
cd5bad2480
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours am: a540241260 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: I873303e65c4e4e94fc95d70097a7ca17db5d0762
|
2021-08-10 22:57:35 +00:00 |
|
Automerger Merge Worker
|
50c7797637
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev am: 7162d024b2 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 de779f8124 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: Ia7b043f41c17732d468dc64daa819d978d1e2650
|
2021-08-10 22:42:49 +00:00 |
|
Dave Mankoff
|
a540241260
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours am: 80a875282b -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: Ia83a72319614bb3cf3f94caab49f4581c89374e4
|
2021-08-10 22:42:41 +00:00 |
|
Michael Groover
|
a13fd1a4db
|
Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev am: 71f64ff1ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508291
Change-Id: Ibee7ad78253a2fe02957b6b05d26d740d38a0433
|
2021-08-10 22:34:47 +00:00 |
|
TreeHugger Robot
|
0606505179
|
Merge changes I7a3ba2af,Ifa89ae43 into sc-dev am: 0f1dd468bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15504100
Change-Id: Ie6cc54562360d2c028ec416a57322c7f923f8b5a
|
2021-08-10 22:33:57 +00:00 |
|
TreeHugger Robot
|
6ce048e329
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours am: 48411fcd34 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508304
Change-Id: Ia70e6bd1ca3250fd6d50ee9bd53accc36593ca49
|
2021-08-10 22:32:52 +00:00 |
|
Michael Groover
|
71f64ff1ac
|
Merge "Create new instance of shared lineage signers to preserve capabilities" into sc-dev
|
2021-08-10 22:30:03 +00:00 |
|
Automerger Merge Worker
|
7162d024b2
|
Merge "[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours" into qt-dev
|
2021-08-10 22:29:35 +00:00 |
|
Dave Mankoff
|
926e47bcdc
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: If05869aa7d10c4696e98b6e677491792f272ea73
|
2021-08-10 22:29:02 +00:00 |
|
TreeHugger Robot
|
0f1dd468bd
|
Merge changes I7a3ba2af,Ifa89ae43 into sc-dev
* changes:
Fix app widget deadlock when toggling overlays
Revert "Revert "Apply overlay updates to widget provider info""
|
2021-08-10 21:46:39 +00:00 |
|
TreeHugger Robot
|
48411fcd34
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: ddd769d0d6 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15508304
Change-Id: Icb6ba573de3d611c8f506b355b2f8a15c6834579
|
2021-08-10 21:29:34 +00:00 |
|
Dave Mankoff
|
80a875282b
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours am: 70a5657935 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: If6c9892c0816129270ee0c9ebaeb22c4bf7bc5a5
|
2021-08-10 21:29:16 +00:00 |
|
Soonil Nagarkar
|
271b907bab
|
Fix Location equals()
Should handle extras in a better manner.
Bug: 196075248
Test: presubmits + manual
Change-Id: I89e45c289b26ea97486c5a72feb0a805c8c1a950
|
2021-08-10 14:25:39 -07:00 |
|
TreeHugger Robot
|
ddd769d0d6
|
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
|
2021-08-10 21:10:45 +00:00 |
|
Dave Mankoff
|
70a5657935
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev am: 58dcd2c312 -s ours
am skip reason: Merged-In Iebaba435c17c5644c5357c0683858447f5ffb897 with SHA-1 c279a42a3f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15347646
Change-Id: Iaa43cc4773165cd15b16f9f072977bc0b7feb01a
|
2021-08-10 21:08:46 +00:00 |
|
Dave Mankoff
|
58dcd2c312
|
Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into oc-mr1-dev
|
2021-08-10 20:35:05 +00:00 |
|
Dave Mankoff
|
52f4e7e822
|
[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: 804799ae8a -s ours am: da9baed374 -s ours am: 642240ef30 -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: I5ec200099907035558540f335196d959779fbfd6
|
2021-08-10 20:19:54 +00:00 |
|
Dave Mankoff
|
c2021a3074
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -s ours am: 49ee68690f -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: If0ab29dc9fd37e6c7dafe106970b6cf421676fca
|
2021-08-10 20:19:32 +00:00 |
|
TreeHugger Robot
|
87b06aefa2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 262de4fb4f -s ours am: 785ec227e5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15509032
Change-Id: I076d4584064147ae1d0162343be53b1cc383c182
|
2021-08-10 20:19:19 +00:00 |
|
TreeHugger Robot
|
1adecd0740
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5f7ad43cdf -s ours am: fcd7401cfd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15509039
Change-Id: If69380b301fc9e1b0a369e2a72f8266560897007
|
2021-08-10 20:19:11 +00:00 |
|
TreeHugger Robot
|
817a17b203
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours am: 2e95d0be8c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515959
Change-Id: I282ab9baf3fd1b30bfd5f6db270e92866b6757a6
|
2021-08-10 20:19:01 +00:00 |
|
Dave Mankoff
|
6025909575
|
[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: 804799ae8a -s ours am: dab8365333 -s ours am: 826e38be42 -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: I059aeaa1f2b8dc4db3af5dd0fdddde12b29adae1
|
2021-08-10 20:18:48 +00:00 |
|
Dave Mankoff
|
edb8eab9eb
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: be89b2aa43 -s ours am: 4bd029298a -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: Iaba24bc4c04a8e675f1c5300288423fb10c0729d
|
2021-08-10 20:18:25 +00:00 |
|
Dave Mankoff
|
642240ef30
|
[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: 804799ae8a -s ours am: da9baed374 -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: If4dcbe01a5eacf2377fe25aecd908fb16dd54ca8
|
2021-08-10 20:15:43 +00:00 |
|
Dave Mankoff
|
49ee68690f
|
[automerger skipped] Merge "Guard DISABLE_PLUGIN with PLUGIN permission." into qt-dev am: b279744b70 am: 0122320cb2 -s ours am: 5a382b6915 -s ours am: 4b8f7a7991 -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: I7db06a50bfe7ac974fc07714ae46d243ee64f8e6
|
2021-08-10 20:15:29 +00:00 |
|
TreeHugger Robot
|
785ec227e5
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 262de4fb4f -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15509032
Change-Id: Ic4f62ce35190b8d7e10de407d38f1bed1cd5e8d1
|
2021-08-10 20:15:01 +00:00 |
|
TreeHugger Robot
|
fcd7401cfd
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 5f7ad43cdf -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15509039
Change-Id: I9c1713135dcd37c589bbe24150dbed690ff5cbfb
|
2021-08-10 20:14:38 +00:00 |
|
TreeHugger Robot
|
2e95d0be8c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 40cb9ed9c1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15515959
Change-Id: Ice118db3b140053137bc8ea0117f20ac891e3227
|
2021-08-10 20:13:59 +00:00 |
|
Dave Mankoff
|
826e38be42
|
[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: 804799ae8a -s ours am: dab8365333 -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: Iedefd042d0ced95d7d2da35cfb351949cae13e25
|
2021-08-10 20:03:52 +00:00 |
|