Automerger Merge Worker
f024443201
Merge "Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f" into rvc-d1-dev-plus-aosp am: fb4711208f am: 5da8f8076b
...
Change-Id: Icdb7f4730049cda288b9b3f7b1727b89a5ad0e72
2020-02-28 21:51:19 +00:00
Automerger Merge Worker
6521f42202
[automerger skipped] Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: af7610e9c5 am: 6307b49aea -s ours am: b8ab173670 -s ours
...
am skip reason: Change-Id Ifdd7ee37687da2e4c7abed61569cf342f95b2611 with SHA-1 dee28c91a3
2020-02-28 21:51:01 +00:00
Automerger Merge Worker
1891528034
[automerger skipped] Merge "Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: ce92347e60 am: 251a2c2304" into rvc-qpr-dev-plus-aosp am: 405d994f17 -s ours
...
am skip reason: Change-Id Ifdd7ee37687da2e4c7abed61569cf342f95b2611 with SHA-1 aea2c50cd8
2020-02-28 21:50:51 +00:00
Automerger Merge Worker
4fe50e014f
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: eac4d861bd am: a07e12a78e am: 1eead22696
...
Change-Id: I6c6aaccc16a801b306d32422e6af579cb33bfc55
2020-02-28 21:50:37 +00:00
Automerger Merge Worker
e69cd97cec
Merge "[automerger skipped] Merge changes from topic "am-f7705fa494054376a78941561e6b12e9" into rvc-d1-dev-plus-aosp am: 1e032b50b0 -s ours am skip reason: Change-Id Ief1cac1952302e43a2c57314bc1449fa7bf38ba7 with SHA-1 ea134edcd5 is in history" into rvc-qpr-dev-plus-aosp am: 022ac56b71 -s ours
...
am skip reason: Change-Id Ief1cac1952302e43a2c57314bc1449fa7bf38ba7 with SHA-1 ea134edcd5
2020-02-28 21:50:22 +00:00
Automerger Merge Worker
ff41304e73
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f am: e4fdade48c am: ba6f549d1f
...
Change-Id: I62418a7301a1a6aa3e5737ce372ee8706874a10d
2020-02-28 21:49:53 +00:00
Automerger Merge Worker
c0772340e3
[automerger skipped] Merge changes from topic "am-8afcef02fb40430cb2d15df5ac59dec5" into rvc-qpr-dev-plus-aosp am: 9485a7a904 -s ours
...
am skip reason: Change-Id Ief1cac1952302e43a2c57314bc1449fa7bf38ba7 with SHA-1 ea134edcd5
2020-02-28 21:49:17 +00:00
Automerger Merge Worker
cafd3a24c8
[automerger skipped] Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 333aa55f87 am: 2ad9603397 am: 74755c4332 -s ours
...
am skip reason: Change-Id Ief1cac1952302e43a2c57314bc1449fa7bf38ba7 with SHA-1 5e6a959653
2020-02-28 21:48:37 +00:00
Automerger Merge Worker
d6096bfa5c
[automerger skipped] LockSettingsService: move database storage am: a486e2d780 am: e6fa66af66 am: 8c63ded41f am: b9a6773e04 -s ours
...
am skip reason: Change-Id Ibc9236a171cedd3b09b1afed70895bc91e895a1c with SHA-1 366c310e4a
2020-02-28 21:48:34 +00:00
TreeHugger Robot
195db0db49
Merge "Remove InputChannel.finalize() by using NativeAllocationRegistry"
2020-02-28 21:44:22 +00:00
Automerger Merge Worker
5da8f8076b
Merge "Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f" into rvc-d1-dev-plus-aosp am: fb4711208f
...
Change-Id: I4b535a261fda94d0824a76080a8561df14763ef1
2020-02-28 21:40:32 +00:00
Automerger Merge Worker
b8ab173670
[automerger skipped] Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: af7610e9c5 am: 6307b49aea -s ours
...
am skip reason: Change-Id Ifdd7ee37687da2e4c7abed61569cf342f95b2611 with SHA-1 dee28c91a3
2020-02-28 21:40:10 +00:00
Automerger Merge Worker
405d994f17
Merge "Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: ce92347e60 am: 251a2c2304" into rvc-qpr-dev-plus-aosp
2020-02-28 21:40:00 +00:00
Automerger Merge Worker
1bad9b646d
Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: ce92347e60 am: 251a2c2304
...
Change-Id: If9a96da20545c7fe517beaa2da9b11756749a5d0
2020-02-28 21:39:53 +00:00
Automerger Merge Worker
1eead22696
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: eac4d861bd am: a07e12a78e
...
Change-Id: Ie2a58fbf1de9f60c02e0aae85a399dc944280cda
2020-02-28 21:39:49 +00:00
Automerger Merge Worker
022ac56b71
Merge "[automerger skipped] Merge changes from topic "am-f7705fa494054376a78941561e6b12e9" into rvc-d1-dev-plus-aosp am: 1e032b50b0 -s ours am skip reason: Change-Id Ief1cac1952302e43a2c57314bc1449fa7bf38ba7 with SHA-1 ea134edcd5 is in history" into rvc-qpr-dev-plus-aosp
2020-02-28 21:39:38 +00:00
Automerger Merge Worker
b9fbf1675d
[automerger skipped] Merge changes from topic "am-f7705fa494054376a78941561e6b12e9" into rvc-d1-dev-plus-aosp am: 1e032b50b0 -s ours
...
am skip reason: Change-Id Ief1cac1952302e43a2c57314bc1449fa7bf38ba7 with SHA-1 ea134edcd5
2020-02-28 21:39:33 +00:00
Automerger Merge Worker
ba6f549d1f
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f am: e4fdade48c
...
Change-Id: Ib20a7e6b99fbfdc1144ce0332f7b3f7285573ade
2020-02-28 21:39:32 +00:00
Automerger Merge Worker
9485a7a904
Merge changes from topic "am-8afcef02fb40430cb2d15df5ac59dec5" into rvc-qpr-dev-plus-aosp
...
* changes:
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf333aa55f87cf72da82a5a486e2d780e6fa66af660697e84223
2020-02-28 21:39:04 +00:00
Automerger Merge Worker
6b8c54496d
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 333aa55f87 am: cf72da82a5
...
Change-Id: I46b74590765161c3cd84312bce44afbe2ecdc6f9
2020-02-28 21:38:58 +00:00
Automerger Merge Worker
74755c4332
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 333aa55f87 am: 2ad9603397
...
Change-Id: Id1a62af3f11f0c0661fc02508ae71c3021578d62
2020-02-28 21:38:56 +00:00
Automerger Merge Worker
c91f666f32
LockSettingsService: move database storage am: a486e2d780 am: e6fa66af66 am: 0697e84223
...
Change-Id: I587500ef5a008259e3078f19f32d8c5fd34083a1
2020-02-28 21:38:54 +00:00
Automerger Merge Worker
b9a6773e04
LockSettingsService: move database storage am: a486e2d780 am: e6fa66af66 am: 8c63ded41f
...
Change-Id: I22656bbf63ec860027d4e15bbfc66cc33c11655c
2020-02-28 21:38:52 +00:00
Automerger Merge Worker
fb4711208f
Merge "Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f" into rvc-d1-dev-plus-aosp
2020-02-28 21:24:28 +00:00
Automerger Merge Worker
251a2c2304
Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: ce92347e60
...
Change-Id: Ib952c575368af81262a9889930154da3eb3d3d0f
2020-02-28 21:24:17 +00:00
Automerger Merge Worker
6307b49aea
Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d am: af7610e9c5
...
Change-Id: I8225719a750d3d3d023ee836c0825ffeb6141000
2020-02-28 21:24:15 +00:00
Automerger Merge Worker
e4fdade48c
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f
...
Change-Id: I057bccfb0382dfbd08b8577dd0a3147dbe1d26ce
2020-02-28 21:24:09 +00:00
Automerger Merge Worker
a07e12a78e
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: eac4d861bd
...
Change-Id: I01ecd988a31b45bd289ceb52556460901c5467af
2020-02-28 21:24:07 +00:00
Automerger Merge Worker
e5e48132c0
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d am: a438c3b63f
...
Change-Id: I4455fbfef2fc68733e09b4be52dff4fb164362dd
2020-02-28 21:24:03 +00:00
Automerger Merge Worker
1e032b50b0
Merge changes from topic "am-f7705fa494054376a78941561e6b12e9" into rvc-d1-dev-plus-aosp
...
* changes:
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf398252d3a9a486e2d7802bdcfa062c
2020-02-28 21:24:01 +00:00
Automerger Merge Worker
5a4cff4d82
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 398252d3a9
...
Change-Id: I779147eb5483fb35fa5bd1799d3de48df3244ef4
2020-02-28 21:23:57 +00:00
Automerger Merge Worker
d67d6afb83
LockSettingsService: move database storage am: a486e2d780 am: 2bdcfa062c
...
Change-Id: Ic8a69a36368054f81ea18c40fef336b59c840420
2020-02-28 21:23:55 +00:00
Automerger Merge Worker
2ad9603397
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 333aa55f87
...
Change-Id: Ie346a99fc26bf01950616342e16b4ac7a1f30f76
2020-02-28 21:23:51 +00:00
Automerger Merge Worker
8c63ded41f
LockSettingsService: move database storage am: a486e2d780 am: e6fa66af66
...
Change-Id: I546fb53e4eb19e65146e28fc4b602ac9ecae5f3d
2020-02-28 21:23:48 +00:00
Automerger Merge Worker
cf72da82a5
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf am: 333aa55f87
...
Change-Id: I156e95b61a749e96c83fdb7069af64afe617e1c2
2020-02-28 21:23:45 +00:00
Automerger Merge Worker
0697e84223
LockSettingsService: move database storage am: a486e2d780 am: e6fa66af66
...
Change-Id: Ib550d02e3a7d568188b7aee18d6b5e60d7d934f2
2020-02-28 21:23:41 +00:00
Automerger Merge Worker
8e07c4f403
Merge "Fix some javadoc issues." into rvc-dev am: ae5a3ee6df am: a35ff2e7e8 am: 41aec067e8 am: 395c3985dd
...
Change-Id: I592122059c065f2f209dcd9c7c2d2fb9b048430e
2020-02-28 21:11:41 +00:00
Automerger Merge Worker
4b819cc332
Merge "Fix DevicePolicyManagerServiceMigrationTest" into rvc-dev am: 099d56392f am: b8d2226649 am: 801929405f am: 7f31afcbb8
...
Change-Id: I4ea7408da0b2540d772723bb2bb65be2edb51cb7
2020-02-28 21:11:33 +00:00
Automerger Merge Worker
1a5107b72e
Merge changes from topic "am-efef07a65a544778a47a2d4ff136efa0" into rvc-d1-dev-plus-aosp am: 5858ae4686 am: 74523889cb
...
Change-Id: I62b42deac178fa8d9465d53c0f0086b8cf228d67
2020-02-28 21:11:24 +00:00
Automerger Merge Worker
5fc6bdde10
startop: Fix a bug in iorap functional test. am: 6411a3353d am: 8982a71fcb am: 41aa74efd0 am: 117c0a6ae1
...
Change-Id: I0175275a53e3d45157fa4f26892edefe763086c8
2020-02-28 21:11:21 +00:00
Automerger Merge Worker
af7610e9c5
Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d
...
Change-Id: I156fb0e9b6b703577873003f2350b6e640603d7c
2020-02-28 21:10:57 +00:00
Automerger Merge Worker
3de8559d3c
Merge "Fix some javadoc issues." into rvc-dev am: ae5a3ee6df am: 33edca557a am: d0f27d3d43 am: 00bc2f78ff
...
Change-Id: Iec08e625c6b2a1641676ba0a1105adf4624d5f05
2020-02-28 21:10:47 +00:00
Automerger Merge Worker
eac4d861bd
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d
...
Change-Id: I5d5b76e871d61aac3421ccbfab383c2596c12a98
2020-02-28 21:10:44 +00:00
Automerger Merge Worker
ce92347e60
Merge "Unify toast presentation code" into rvc-dev am: 9b256a210d
...
Change-Id: I810c0a37d1f63280e11e2d3270032e0c7f45e7f0
2020-02-28 21:10:38 +00:00
Automerger Merge Worker
398252d3a9
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf
...
Change-Id: Iff94b0c28936664b0aab13b47e6ebea54704795c
2020-02-28 21:10:27 +00:00
Automerger Merge Worker
15b12ecfd9
Merge "Merge "Fix some javadoc issues." into rvc-dev am: ae5a3ee6df am: 33edca557a am: e3f4313a0d" into rvc-qpr-dev-plus-aosp am: d3954324b1
...
Change-Id: I53b51bbb19b064bbe1298147cbdad7a50578c6a7
2020-02-28 21:10:26 +00:00
Automerger Merge Worker
2bdcfa062c
LockSettingsService: move database storage am: a486e2d780
...
Change-Id: Ie0319a3be6be32793604397317de942d3d7139c2
2020-02-28 21:10:22 +00:00
Automerger Merge Worker
a438c3b63f
Merge "Fix typo in SurfaceControlViewHost relayout overload" into rvc-dev am: 228376091d
...
Change-Id: I40a9993ebddd02d96ad3bf3cac92fcf251e95612
2020-02-28 21:10:20 +00:00
Automerger Merge Worker
2573e6a61d
Merge "Fix DevicePolicyManagerServiceMigrationTest" into rvc-dev am: 099d56392f am: 5ab0509870 am: 442f3fadaf am: 463737d0a8
...
Change-Id: I410368d5fcb9aec6ff87c80a795fa9e7c6f3bdf5
2020-02-28 21:10:14 +00:00
Automerger Merge Worker
333aa55f87
Merge changes Ief1cac19,Ibc9236a1 into rvc-dev am: 3e5a0605cf
...
Change-Id: I2ec9c37c9d2ebbe8b1ea79f61cb32e5d7f0e4cc3
2020-02-28 21:10:10 +00:00
