Commit Graph

664183 Commits

Author SHA1 Message Date
TreeHugger Robot
2a41bb06a2 Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 81321095aa am: 9f13df4f89
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: Ia80693d67b5dbf762649e72175d87de60b30b023
2021-08-11 02:34:52 +00:00
Automerger Merge Worker
5301f464f0 Merge "Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 81321095aa am: bf93994c78" into sc-v2-dev-plus-aosp 2021-08-11 02:34:40 +00:00
TreeHugger Robot
438e081220 Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 81321095aa am: bf93994c78
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: I3287c530c1cbed6f6ac53a439820fb4697bcfb8c
2021-08-11 02:34:31 +00:00
TreeHugger Robot
c5603b5962 Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 07b2ff7a54 am: 0db8d6194e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: Ic818e223dbbf4c893893f6947078095a0a43cf19
2021-08-11 02:34:24 +00:00
TreeHugger Robot
9f13df4f89 Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 81321095aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: I16bc2771042c99cfa3d49703fa32433fbc0345f0
2021-08-11 02:22:15 +00:00
TreeHugger Robot
bf93994c78 Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 81321095aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: I13c0cf500d49d5fad0a0127e67cdb22f4ca6cf63
2021-08-11 02:22:15 +00:00
TreeHugger Robot
0db8d6194e Merge "Fix Location equals()" into sc-dev am: b42181c3be am: 07b2ff7a54
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: Ib28fa59ea209e8de0805cbde56842ea23d79ad0e
2021-08-11 02:21:45 +00:00
TreeHugger Robot
81321095aa Merge "Fix Location equals()" into sc-dev am: b42181c3be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15519010

Change-Id: Icedd653047fc4356a6b5a0cb4b4cff3cebbd8f1f
2021-08-11 02:08:46 +00:00
Sudheer Shanka
7a0edb8d50 [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: 3ccf5ed191 -s ours am: d758d8398e -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: I7a64fd64de3b6f2b4cf0d8ccd5ad2d90b821c822
2021-08-11 02:08:07 +00:00
Sudheer Shanka
6b0f5829f5 [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: 69f41f8378 -s ours am: e2bb111c45 -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: I63b9971a368940c5db41408c2d03fe3ff5323a73
2021-08-11 02:07:53 +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
Sudheer Shanka
1abf6539af [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: 3ccf5ed191 -s ours am: 4e8145a475 -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: I3f75c85db20aa73fe5a333c7066ba7df2bf6a35a
2021-08-11 01:58:12 +00:00
Sudheer Shanka
4e8145a475 [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: 3ccf5ed191 -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: I49003425569c1b850d92a020fb1f407f3258d81b
2021-08-11 01:53:37 +00:00
Sudheer Shanka
d758d8398e [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: 3ccf5ed191 -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: Icc8bb812c4a27420a0d69eeccef4dfe3aa56ff2d
2021-08-11 01:53:36 +00:00
Sudheer Shanka
e2bb111c45 [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: 69f41f8378 -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: Ie0cc96e20dc51915bd7ee2d87995b3997abefa24
2021-08-11 01:53:00 +00:00
Wei Sheng Shih
bbbe61c926 Merge "Use window manager global to add/remove starting window." into sc-v2-dev am: 7dd382e0e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15416736

Change-Id: I18565b8e3ed3fe98797f1325ce8ecf2ddb3eda69
2021-08-11 01:52:50 +00:00
TreeHugger Robot
b42181c3be Merge "Fix Location equals()" into sc-dev 2021-08-11 01:52:31 +00:00
Sudheer Shanka
3ccf5ed191 [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: I1cf39986321b65567bf5397adaad368b1b47457d
2021-08-11 01:41:22 +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
Wei Sheng Shih
7dd382e0e9 Merge "Use window manager global to add/remove starting window." into sc-v2-dev 2021-08-11 01:38:26 +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
23dd088c51 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: 285f1b264f -s ours am: f49c91e6a8 -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: I2f101a8a0d15f466d1f4526e5c157830f1ee6902
2021-08-11 00:07:52 +00:00
Dave Mankoff
edc98f652a [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: 2fe09420a3 -s ours am: c151a0669c -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: I671f139cfcb06d6ed8cf56c0141dc6b752a0d461
2021-08-11 00:07:40 +00:00
Automerger Merge Worker
4a74f9aeb5 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: 18671436c2 -s ours am: 028ac7e69c -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: I6ff8e20176da675496369cd786895569e92a899b
2021-08-11 00:07:31 +00:00
Automerger Merge Worker
e8ff5585d3 Merge "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: 98f71be4d7 -s ours" into sc-qpr1-dev-plus-aosp am: 5f73bdde66 -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/+/15347646

Change-Id: Ic901650bf2f942637bbe74d60659f1f08e9161ea
2021-08-11 00:07:20 +00:00
Automerger Merge Worker
e5cbfaed7c 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: 285f1b264f -s ours am: fb0204cc81 -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: If42125bdbfe936ee23723d600bc1174b6ab61121
2021-08-11 00:07:13 +00:00
Automerger Merge Worker
7f3d2212a1 Merge "[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: f3cf4a43ee -s ours am: 92e929d964 -s ours" into sc-v2-dev-plus-aosp 2021-08-11 00:07:07 +00:00
Dave Mankoff
83168c3dff [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: f3cf4a43ee -s ours am: 92e929d964 -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: Idd1d619538612345d90a2c1958a88f3a22323904
2021-08-11 00:07:04 +00:00
Dave Mankoff
4953bc15ab [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: 2fe09420a3 -s ours am: c7fd1ab358 -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: I91dde4980b535cefeb35217ee84643a9ae43a4fb
2021-08-11 00:07:02 +00:00
Automerger Merge Worker
66888a6172 Merge "Merge "[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: 5656402f58 -s ours" into sc-qpr1-dev-plus-aosp am: 589fe1a78b -s ours" into sc-v2-dev-plus-aosp 2021-08-11 00:06:57 +00:00
Automerger Merge Worker
38a443ea61 Merge "[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: 5656402f58 -s ours" into sc-qpr1-dev-plus-aosp am: 589fe1a78b -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/+/15347646

Change-Id: Iab78741b3a76a274dbb08af729278023fa96aa14
2021-08-11 00:06:52 +00:00
Automerger Merge Worker
1157bc8c12 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: 98f71be4d7 -s ours am: fe36aa3c56 -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: I43922d12ca7b88ff57cfd0ffb6946c499bb17258
2021-08-11 00:06:51 +00:00
Automerger Merge Worker
ea194fa52f Merge "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: 21877a9eec -s ours am: a8ca9d086a -s ours" into sc-v2-dev-plus-aosp 2021-08-11 00:06:37 +00:00
Automerger Merge Worker
5de61ba982 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: 21877a9eec -s ours am: a8ca9d086a -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: Ie5188430a7c8082b8ed010346a996e983ca9566b
2021-08-11 00:06:35 +00:00
Dave Mankoff
5e29fc7455 [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: 5656402f58 -s ours am: 2410d5bd9d -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: I9994409ff01fb9a69449aee96a2c1f5667dc533a
2021-08-11 00:06:26 +00:00
Dave Mankoff
a47b46c5dc [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: 45330c3e7d -s ours am: 4be8cc6da8 -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: Ib729c5f54399945843a4834a8c98b681e99cebc4
2021-08-11 00:06:00 +00:00
Automerger Merge Worker
f49c91e6a8 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: 285f1b264f -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: I3005ffb647815776fad2df013e76a5fb17ea06fb
2021-08-10 23:52:38 +00:00
Automerger Merge Worker
fb0204cc81 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: 285f1b264f -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: If1a4cb5df93a4ec9f6807e32c4b61f720e0b4bf0
2021-08-10 23:52:29 +00:00
Dave Mankoff
c151a0669c [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: 2fe09420a3 -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: Iccd2baab92d564e92bbc8e27131470ef1409cede
2021-08-10 23:52:22 +00:00
Dave Mankoff
c7fd1ab358 [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: 2fe09420a3 -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: I2d012ab1ea79a1218377d7b4f52301371312e8b8
2021-08-10 23:52:20 +00:00
Automerger Merge Worker
028ac7e69c 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: 18671436c2 -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: I8dfc7e8f4e9b6445eb3e26e0720a327c903cddeb
2021-08-10 23:52:17 +00:00
Automerger Merge Worker
5f73bdde66 Merge "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: 98f71be4d7 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 23:52:12 +00:00
Automerger Merge Worker
fe36aa3c56 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: 98f71be4d7 -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: I1c15a2d7e37de4494ac73ec83160864072c5275a
2021-08-10 23:51:58 +00:00
Automerger Merge Worker
be49f0f732 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: 98f71be4d7 -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: I6d292bfb81bd95a4f8d9e2a2db0634ea512dbba2
2021-08-10 23:51:58 +00:00
Dave Mankoff
92e929d964 [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: f3cf4a43ee -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: I32c1f6c83325dc5b0e7bd57bade8076945396ac1
2021-08-10 23:51:54 +00:00
Automerger Merge Worker
589fe1a78b Merge "[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: 5656402f58 -s ours" into sc-qpr1-dev-plus-aosp 2021-08-10 23:51:51 +00:00
Dave Mankoff
3f1fe673fb [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: 5656402f58 -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: I2f41fbf0b0d291bd466ab10c2ddb1e105c1e0c85
2021-08-10 23:51:42 +00:00
Dave Mankoff
2410d5bd9d [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: 5656402f58 -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: I4c454d26974f0ff8771308a0ef3a2a545e1850f4
2021-08-10 23:51:38 +00:00
Automerger Merge Worker
a8ca9d086a 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: 21877a9eec -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: I5209a2d36104845d3beafc3a4b3e82a28c6a6681
2021-08-10 23:51:35 +00:00