Commit Graph

518164 Commits

Author SHA1 Message Date
Fabian Kozynski
60da8fd015 Merge "Add auto tiles by config" into rvc-dev am: 01702af7a3 am: f1ea10bde3 am: 7095e06b41
Change-Id: Ifaca51a2a127d8c5e8dd374bbafc31e0afa84ea9
2020-05-05 16:07:23 +00:00
Fabian Kozynski
7095e06b41 Merge "Add auto tiles by config" into rvc-dev am: 01702af7a3 am: f1ea10bde3
Change-Id: Ib606f52398bf92236fc3462df57cf9d676d20809
2020-05-05 15:44:52 +00:00
TreeHugger Robot
ed4045bfdb [automerger skipped] Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: 687acec369 am: 86859a790f am: b2f4ca9565 -s ours
am skip reason: Change-Id I79e1bbde2c5cb5fe588a29111294fab68c546c7c with SHA-1 50883d72aa is in history

Change-Id: I3b0cc7960f563aa700e112ecda77806113bdbeed
2020-05-05 15:38:09 +00:00
TreeHugger Robot
86aab7166d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours am: 14d4d10748 -s ours am: 4ffdcf1e8a -s ours
am skip reason: subject contains skip directive

Change-Id: Iafdb7d139ec19f43a4cbf54be0fba7a4393210e7
2020-05-05 15:37:47 +00:00
TreeHugger Robot
7116e69ad7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: bba456186d -s ours am: a4a5213ce8 -s ours am: 8a051583ac -s ours
am skip reason: subject contains skip directive

Change-Id: Id51687691d840a64ba848a428ea1843dc86a0ae9
2020-05-05 15:37:39 +00:00
TreeHugger Robot
a49252ddd1 [automerger skipped] Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: b0471d9aa8 -s ours am: 5bc9e4196c -s ours
am skip reason: Change-Id I79e1bbde2c5cb5fe588a29111294fab68c546c7c with SHA-1 50883d72aa is in history

Change-Id: Ibcf1c63c89f9da15b164c1c2e4670e4ccf346dec
2020-05-05 15:26:10 +00:00
TreeHugger Robot
0fad341f11 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 6bdad2de20 -s ours am: 16d1db127b -s ours
am skip reason: subject contains skip directive

Change-Id: Ia51a6f030ba039208949841772e8ebc41f2ba43e
2020-05-05 15:26:02 +00:00
TreeHugger Robot
2a56696183 Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: 687acec369 am: f2dd477cd1
Change-Id: I95a559770b0f0fca7094a0ea55adfe7a30cf5c59
2020-05-05 15:25:54 +00:00
Automerger Merge Worker
7fad9b65f9 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours" into rvc-d1-dev-plus-aosp am: 7fda4abb9f -s ours
am skip reason: subject contains skip directive

Change-Id: I0aee19d1039929bb01f5ffde6118681fa465cfcc
2020-05-05 15:25:30 +00:00
Fabian Kozynski
f1ea10bde3 Merge "Add auto tiles by config" into rvc-dev am: 01702af7a3
Change-Id: I2136ca8ca804114db95e784eb22eb3ac2869efa0
2020-05-05 15:25:29 +00:00
TreeHugger Robot
b2f4ca9565 Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: 687acec369 am: 86859a790f
Change-Id: Id3d510ed8c18e11904d503d9a37efc32fb607ad9
2020-05-05 15:25:25 +00:00
TreeHugger Robot
fb862dbfb8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: 3c1027b6fa -s ours am: 166574a9a9 -s ours
am skip reason: subject contains skip directive

Change-Id: If33bce12418c3837b52b8975d950d46ede80bfac
2020-05-05 15:25:12 +00:00
TreeHugger Robot
4ffdcf1e8a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours am: 14d4d10748 -s ours
am skip reason: subject contains skip directive

Change-Id: I421a988711ebe48f3a2f32b639d7ce96d179a412
2020-05-05 15:24:56 +00:00
TreeHugger Robot
87329bdcb6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: bba456186d -s ours am: 3236ba7978 -s ours
am skip reason: subject contains skip directive

Change-Id: I3679a60eb316c04c1fa322a6f52beeb91f9fd200
2020-05-05 15:24:36 +00:00
TreeHugger Robot
8a051583ac [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: bba456186d -s ours am: a4a5213ce8 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie737b2cf83db477c237174a1871742ab8abef312
2020-05-05 15:24:23 +00:00
TreeHugger Robot
5bc9e4196c [automerger skipped] Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: b0471d9aa8 -s ours
am skip reason: Change-Id I79e1bbde2c5cb5fe588a29111294fab68c546c7c with SHA-1 50883d72aa is in history

Change-Id: I998729649469f7687fdb973a53d8b94ff271d683
2020-05-05 15:06:58 +00:00
TreeHugger Robot
86859a790f Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: 687acec369
Change-Id: Ia8c9504529e3aa1df1b9c33e5c4f5a73c1f1fbcd
2020-05-05 15:06:37 +00:00
TreeHugger Robot
16d1db127b [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 6bdad2de20 -s ours
am skip reason: subject contains skip directive

Change-Id: I946d37cd1721937c4996a7b11702ddb87c006879
2020-05-05 15:06:33 +00:00
TreeHugger Robot
f2dd477cd1 Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545 am: 687acec369
Change-Id: Ic0c3273debec8afa8d090adf2d98a61b3b034cae
2020-05-05 15:06:25 +00:00
TreeHugger Robot
14d4d10748 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours
am skip reason: subject contains skip directive

Change-Id: I39111873ef817abefc2abe796f78e606aecf8b48
2020-05-05 15:06:24 +00:00
Automerger Merge Worker
7fda4abb9f Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours" into rvc-d1-dev-plus-aosp 2020-05-05 15:06:18 +00:00
TreeHugger Robot
166574a9a9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: 3c1027b6fa -s ours
am skip reason: subject contains skip directive

Change-Id: I6bb73b52c811d6d9995dff51d600e0a22db2c0d9
2020-05-05 15:06:13 +00:00
TreeHugger Robot
092d8d2625 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours am: 1d1de27f54 -s ours
am skip reason: subject contains skip directive

Change-Id: I3f7498df4b4ebc7902026cbb6d7f78d97f289c64
2020-05-05 15:06:13 +00:00
TreeHugger Robot
a4a5213ce8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: bba456186d -s ours
am skip reason: subject contains skip directive

Change-Id: I3c9a5e4b5159ca1c0cace8ac23d43873f99176de
2020-05-05 15:06:12 +00:00
TreeHugger Robot
3236ba7978 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours am: bba456186d -s ours
am skip reason: subject contains skip directive

Change-Id: I15324b08b883371b8b90a67e55aa8e10ac0f908f
2020-05-05 15:05:54 +00:00
Fabian Kozynski
01702af7a3 Merge "Add auto tiles by config" into rvc-dev 2020-05-05 15:04:14 +00:00
TreeHugger Robot
68ffa6524e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c125c2579c -s ours am: 26a7cb7397 -s ours am: 56c94fbd07 -s ours am: 0773688509 -s ours
am skip reason: subject contains skip directive

Change-Id: I7c515a625c73c145c5845418fc91c03569ca2405
2020-05-05 15:01:53 +00:00
TreeHugger Robot
b0471d9aa8 Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545
Change-Id: I976d3759092830c95baa9c57eba22155fcbd75ab
2020-05-05 14:54:54 +00:00
TreeHugger Robot
687acec369 Merge "Prevent double animation of lockicon when waking." into rvc-dev am: bea0158545
Change-Id: I11607287d3461080aae09b8438c0315c5e6735df
2020-05-05 14:54:51 +00:00
TreeHugger Robot
6bdad2de20 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6d0de1005991041dbce447f1d9eed813c7d3878
2020-05-05 14:54:25 +00:00
TreeHugger Robot
1d1de27f54 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 08063278bd -s ours
am skip reason: subject contains skip directive

Change-Id: I1596a63996b3130961e87dddce4b016b82ffdbaa
2020-05-05 14:54:13 +00:00
TreeHugger Robot
3c1027b6fa [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I08481badf2aef44845a1491349b4873193120fba
2020-05-05 14:53:54 +00:00
TreeHugger Robot
bba456186d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 6a215c34e9 -s ours
am skip reason: subject contains skip directive

Change-Id: I3a83daf515571d8d4ded4da5e85c11b0814824ac
2020-05-05 14:53:34 +00:00
TreeHugger Robot
bea0158545 Merge "Prevent double animation of lockicon when waking." into rvc-dev 2020-05-05 14:48:23 +00:00
Adrian Roos
52bb9c8543 [automerger skipped] Merge "Suppress existing CallbackMethodName lint" am: 91d1ca097a am: 16c424fa7d -s ours am: 761ef8c8fb -s ours am: a744ce4516 -s ours
am skip reason: Change-Id I17258fb333a9bee7eae8ad6488ffeb35dee72ac6 with SHA-1 5af52d3f3e is in history

Change-Id: Ib35443375090c0d3dd9fecd1123284263316677e
2020-05-05 14:46:44 +00:00
Anton Hansson
b3f873830c [automerger skipped] Merge "Rename module dist files" am: 2b4926b52b am: 4ca6df3226 -s ours am: 5cdc5b9504 -s ours am: b8993bd64c -s ours
am skip reason: Change-Id I076f30931bf2524d57703873cd7de25b3f23b457 with SHA-1 8bf731c0fc is in history

Change-Id: I69d786d50dd529f65191ac1f1c344135a2f36023
2020-05-05 14:46:21 +00:00
TreeHugger Robot
30caeab5f7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c125c2579c -s ours am: 943829a103 -s ours am: ef2b23b391 -s ours
am skip reason: subject contains skip directive

Change-Id: I99af7a8a99db589af6eb06f87c7ce7ed278630f7
2020-05-05 14:45:39 +00:00
TreeHugger Robot
e82a684bfc [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c125c2579c -s ours am: 26a7cb7397 -s ours am: 20609724c5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5941b3e9c5e3e75556e531f140bf88dc3cca32b
2020-05-05 14:44:57 +00:00
TreeHugger Robot
0773688509 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c125c2579c -s ours am: 26a7cb7397 -s ours am: 56c94fbd07 -s ours
am skip reason: subject contains skip directive

Change-Id: I26d7d957725ab514e8a505f22b89e1be51acaca3
2020-05-05 14:44:48 +00:00
TreeHugger Robot
08063278bd Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-05 14:40:56 +00:00
TreeHugger Robot
6a215c34e9 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-05 14:39:25 +00:00
Will Brockman
ca97d5514e Merge "Distinguish statsd notification actions logs." into rvc-dev am: 54343748d4 am: 8e5e1384c2 am: 28e00e0147 am: 1b1400e486
Change-Id: Ie0de55449e8f6cfcd61668ae51d8dc679205f035
2020-05-05 14:36:19 +00:00
Fabian Kozynski
4df84a4489 Merge "Use Buffered reader when loading favorites" into rvc-dev am: 450205e4c6 am: 478928abad am: a2677f592f am: 04ec969f78
Change-Id: I902688fcf2e90d2765918e8cd2160cf1fe8126c4
2020-05-05 14:35:54 +00:00
Kholoud Mohamed
d878a0c55b Merge "Fix bug in IntentForwarderActivity" into rvc-dev am: d4d2427c01 am: 795db636b9 am: 8aad92e32b am: c7866e3e8b
Change-Id: Ib8453a5da9bdd21e1301344ddf0b870dbc70462a
2020-05-05 14:35:44 +00:00
Fabian Kozynski
564b4e0e6d Merge "Fix redlines and strings in Controls dialog" into rvc-dev am: e34b132442 am: 2049c6b5c1 am: 25cc14ea65 am: 6348c52475
Change-Id: I225a5ff05808c148c473091695470b68ea44cb56
2020-05-05 14:35:33 +00:00
Adrian Roos
a744ce4516 [automerger skipped] Merge "Suppress existing CallbackMethodName lint" am: 91d1ca097a am: 16c424fa7d -s ours am: 761ef8c8fb -s ours
am skip reason: Change-Id I17258fb333a9bee7eae8ad6488ffeb35dee72ac6 with SHA-1 5af52d3f3e is in history

Change-Id: I795d5538ecf569eadc6ed18b02678c4aba417249
2020-05-05 14:35:23 +00:00
Fabian Kozynski
f1ac4ae441 Merge "Prevent NPE in ControlsListingControllerImpl" into rvc-dev am: 976c089ff7 am: eba46a76ec am: e7a8dad0a5 am: 3a6c5527fc
Change-Id: Iaf525fd7d60e7a7a7960ba8c8cc7f10eb1e02ccf
2020-05-05 14:35:19 +00:00
Anton Hansson
b8993bd64c [automerger skipped] Merge "Rename module dist files" am: 2b4926b52b am: 4ca6df3226 -s ours am: 5cdc5b9504 -s ours
am skip reason: Change-Id I076f30931bf2524d57703873cd7de25b3f23b457 with SHA-1 8bf731c0fc is in history

Change-Id: I830eb7f103dcce5516446cc7c6f209db9bc8fea6
2020-05-05 14:35:12 +00:00
TreeHugger Robot
ef2b23b391 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c125c2579c -s ours am: 943829a103 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia140086e84b3d0ca46e18e3e1495f801b25cf9d5
2020-05-05 14:34:51 +00:00
TreeHugger Robot
56c94fbd07 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: c125c2579c -s ours am: 26a7cb7397 -s ours
am skip reason: subject contains skip directive

Change-Id: I84ca3675ff979bb6c5747ed44d8ba51e7022cd0d
2020-05-05 14:34:38 +00:00