Automerger Merge Worker
|
e27f6ef6fa
|
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours am: 631493c8e7 am: 2564fce75b
Change-Id: Ie1b45ae946d62be4bb27d9850dcf50149340f431
|
2020-03-12 01:17:41 +00:00 |
|
Automerger Merge Worker
|
0d62a0687a
|
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 86fac6caee am: 98f50c04d4
Change-Id: I8ba0f6eb7af1e8efde1eb3d7f29d81551cfc1485
|
2020-03-12 01:16:57 +00:00 |
|
Automerger Merge Worker
|
fa134a16ee
|
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3 am: 2776dbfa08
Change-Id: I1b906898dc6ea91d62f80544c1e1a15c44557d29
|
2020-03-12 01:14:47 +00:00 |
|
Automerger Merge Worker
|
2564fce75b
|
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours am: 631493c8e7
Change-Id: I05246bc5a8550495c4467946d68e9b2ca9630b7a
|
2020-03-12 00:58:13 +00:00 |
|
Automerger Merge Worker
|
98f50c04d4
|
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 86fac6caee
Change-Id: Id4c6dcad47a067c76a2dcfe1eea1be07768ff068
|
2020-03-12 00:56:45 +00:00 |
|
Automerger Merge Worker
|
2776dbfa08
|
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7 am: 61eb0791a3
Change-Id: Ifc411a318a26169cd3d65e120e8978217377c6a8
|
2020-03-12 00:56:14 +00:00 |
|
Automerger Merge Worker
|
61eb0791a3
|
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
Change-Id: I4094a00c4bf9b04300243a8ff11984e95ac793c1
|
2020-03-12 00:40:12 +00:00 |
|
Automerger Merge Worker
|
631493c8e7
|
[automerger skipped] Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b am: 61167e098e -s ours
am skip reason: skipped by user siyuanh
Change-Id: I0c69f31c9a4e16d3e6f479feddcf2ab452cab8a8
|
2020-03-12 00:39:59 +00:00 |
|
Automerger Merge Worker
|
86fac6caee
|
Merge "Remove search result for hidden magnification." into rvc-dev am: cbd5ec24d7
Change-Id: I856ecc8f4edacd4879e0e72b81460504d5f8548e
|
2020-03-12 00:39:49 +00:00 |
|
TreeHugger Robot
|
cbd5ec24d7
|
Merge "Remove search result for hidden magnification." into rvc-dev
|
2020-03-12 00:25:03 +00:00 |
|
Automerger Merge Worker
|
b93cebd598
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c4ad2628e1 am: 338eaf911b
Change-Id: I2d2bfecce86bfefd5e2e911eb2c93dff19e91e15
|
2020-03-11 21:53:25 +00:00 |
|
Automerger Merge Worker
|
338eaf911b
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c4ad2628e1
Change-Id: Ifcbbd3259d9fd6dcda03c641f17750fbeb49f29d
|
2020-03-11 21:42:14 +00:00 |
|
Automerger Merge Worker
|
5286c1d7dc
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 69a31c2484 am: e7bd699b95
Change-Id: Ie4db901518ac69076b10bbe23c53afc36b72d553
|
2020-03-11 21:30:36 +00:00 |
|
Automerger Merge Worker
|
75eaca4d0a
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7 am: c678022a13
Change-Id: I5d56271aca26da73bc4f821d712455945f589e85
|
2020-03-11 21:29:32 +00:00 |
|
Automerger Merge Worker
|
e7bd699b95
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 69a31c2484
Change-Id: If2a4b69a9f335c24c3f82da22dcac4da0b674570
|
2020-03-11 21:24:01 +00:00 |
|
Automerger Merge Worker
|
c4ad2628e1
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7
Change-Id: I448cbe85cafb3edf91d17b201d924ec2d79d888d
|
2020-03-11 21:23:21 +00:00 |
|
Automerger Merge Worker
|
c678022a13
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68 am: 0cb70101c7
Change-Id: Id210117c4d064bcd05adbc749a181271b5bd8413
|
2020-03-11 21:23:05 +00:00 |
|
Automerger Merge Worker
|
ce81c0baef
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: 038905a840 am: 6211d885d5
Change-Id: I317a27a3122e4a404833159d97257e92b28e0415
|
2020-03-11 21:22:47 +00:00 |
|
Automerger Merge Worker
|
a20e11e02e
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 706c05eaf4 am: ee78d6a0d5
Change-Id: I5da04bed3a5abc722d8deb58dc2d3626fc6eb0cb
|
2020-03-11 21:14:31 +00:00 |
|
Automerger Merge Worker
|
bbe24da6a1
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: f0034eb4ed
Change-Id: Ic1440ee5840cbf9e59193c39b9a717e5d88c327e
|
2020-03-11 21:10:24 +00:00 |
|
Automerger Merge Worker
|
6211d885d5
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983 am: 038905a840
Change-Id: I492181f4a01fdf01b1ff655354f9af3dc909a2e3
|
2020-03-11 21:06:50 +00:00 |
|
Automerger Merge Worker
|
69a31c2484
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68
Change-Id: I0c30d3f4fb38b5ab066e62935d8ce9a7cf3e4e9b
|
2020-03-11 21:00:17 +00:00 |
|
Automerger Merge Worker
|
0cb70101c7
|
Merge "Partial revert of ag/10482633" into rvc-dev am: 8ee5045d68
Change-Id: I3dc14a3085153ff5bdfd9b94c80750f9c6595b64
|
2020-03-11 20:59:46 +00:00 |
|
Automerger Merge Worker
|
ee78d6a0d5
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 706c05eaf4
Change-Id: I23cabacc7df3ef3e0a1238f24c10987a70f97fd1
|
2020-03-11 20:59:21 +00:00 |
|
Automerger Merge Worker
|
f0034eb4ed
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983
Change-Id: I5b4d9c0ab3d2e087b0717728d6896209980986e1
|
2020-03-11 20:59:10 +00:00 |
|
Automerger Merge Worker
|
038905a840
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df am: 279d4d9983
Change-Id: Ibe007653565dc79c492a9fe6664b5ce40d9f8774
|
2020-03-11 20:58:56 +00:00 |
|
Kevin Chyn
|
8ee5045d68
|
Merge "Partial revert of ag/10482633" into rvc-dev
|
2020-03-11 20:56:42 +00:00 |
|
Automerger Merge Worker
|
8d34f80b42
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 9b9f4ec1b7 am: 9028365bca
Change-Id: Ic5925df8d18b92880dfc7eb67b775f492b7b6e28
|
2020-03-11 20:48:00 +00:00 |
|
Automerger Merge Worker
|
279d4d9983
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
Change-Id: I0f8e5ce1eb3dd6358222c81eefeb622cc5bb3ca4
|
2020-03-11 20:47:43 +00:00 |
|
Automerger Merge Worker
|
706c05eaf4
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev am: 79336396df
Change-Id: I366b32e4d47fb10f0ff9b00cfa99d7cc53779ebe
|
2020-03-11 20:47:37 +00:00 |
|
Automerger Merge Worker
|
0a33bcfdf4
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 89f85ccbf6
Change-Id: I822f2873c64505568478375bf5b9c68658028d1d
|
2020-03-11 20:35:42 +00:00 |
|
Automerger Merge Worker
|
9028365bca
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa am: 9b9f4ec1b7
Change-Id: I7691bf710c0e7310fdf960868d30cd13eac11051
|
2020-03-11 20:35:04 +00:00 |
|
Automerger Merge Worker
|
87b44ea9da
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7 am: bfa63c5fbd
Change-Id: Ib20d10a128151a3e22e53f7f7a923e5942cadaef
|
2020-03-11 20:35:04 +00:00 |
|
TreeHugger Robot
|
79336396df
|
Merge "Update empty state for apps bypassing dnd" into rvc-dev
|
2020-03-11 20:33:15 +00:00 |
|
Automerger Merge Worker
|
89f85ccbf6
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa
Change-Id: Id9ac2f6a2b074e8a07a31c401051b135b9b8b34d
|
2020-03-11 20:24:00 +00:00 |
|
Automerger Merge Worker
|
9b9f4ec1b7
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 7152f018fa
Change-Id: I91060da017fe98d629e06d9f817a88d71b33b2a6
|
2020-03-11 20:23:32 +00:00 |
|
Automerger Merge Worker
|
bfa63c5fbd
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab am: 07fb084ce7
Change-Id: Id7db52b4409d8d12d5207f7298b58b7e20f745b5
|
2020-03-11 20:23:25 +00:00 |
|
Automerger Merge Worker
|
7152f018fa
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
Change-Id: I54762e5a403b6879fb3aaf4f93ac8621a1d6dfed
|
2020-03-11 20:10:36 +00:00 |
|
Automerger Merge Worker
|
07fb084ce7
|
Merge "Align help resource usage in caption preferences." into rvc-dev am: 91e5ece7ab
Change-Id: I457fe332b417e991fe7e2625fef8f8f3c176daac
|
2020-03-11 20:09:21 +00:00 |
|
Automerger Merge Worker
|
61167e098e
|
Merge "MetricId: Avoid byte[] and string ambiguity" am: 291ff22d7b
Change-Id: I749ba8ae504f37a7a3e9f2c7aa09ebcca8245964
|
2020-03-11 20:07:54 +00:00 |
|
Julia Reynolds
|
44b5b7c575
|
Update empty state for apps bypassing dnd
Test: atest
Fixes: 150346679
Change-Id: Iccc5f1fb3dd7ee2c114f8757a020833b3b41e91d
|
2020-03-11 18:09:47 +00:00 |
|
Jason Hsu
|
91e5ece7ab
|
Merge "Align help resource usage in caption preferences." into rvc-dev
|
2020-03-11 17:47:16 +00:00 |
|
Chen Chen
|
291ff22d7b
|
Merge "MetricId: Avoid byte[] and string ambiguity"
|
2020-03-11 17:26:37 +00:00 |
|
Automerger Merge Worker
|
f0f896c5e8
|
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f am: bafe942da7 am: fad5089a5f
Change-Id: I45b9da57cb2d4999f5c39056d64c0f1c66a2f0fa
|
2020-03-11 14:16:50 +00:00 |
|
Automerger Merge Worker
|
38801f0232
|
Merge "Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584" into rvc-dev-plus-aosp am: 164dce85e4 am: aa826d85b1
Change-Id: I125357eef5dc23cb6b1d74e02649aa18bdf89b31
|
2020-03-11 14:04:15 +00:00 |
|
Automerger Merge Worker
|
607ecefc8c
|
Merge "Fix Card 2's pin shows ON when only turn on card 1's pin" am: 23c382aa45 am: ec71e52496 am: dcc0fa5f6e am: 9aa950e0d9
Change-Id: Ie13d45d59660e9e46ad168eefc2ae938cfc1f7c4
|
2020-03-11 14:03:58 +00:00 |
|
Automerger Merge Worker
|
fad5089a5f
|
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f am: bafe942da7
Change-Id: If5c2ad317c6671dd897800c45869b9e6812b4353
|
2020-03-11 14:03:46 +00:00 |
|
Automerger Merge Worker
|
cf13163981
|
Merge "Fix TetherSettingsTest" into rvc-dev am: 11dbe14584 am: 539815566f am: c02b876009
Change-Id: Iab2b6461dfc26c32e6c10e017eeef395fc32a21c
|
2020-03-11 14:03:46 +00:00 |
|
jasonwshsu
|
27d06ff502
|
Remove search result for hidden magnification.
* Use searchable = "false" to suppress search indexes.
Bug: 146019459
Test: manual test
Change-Id: I1188f201ddc9ec8d59faf2bcb549839c054f73bd
|
2020-03-11 21:58:25 +08:00 |
|
Automerger Merge Worker
|
449f1a533e
|
Merge "Tweak strings for assist app" into rvc-dev am: 16a7ba81f4 am: aeb13d1dd9 am: 4f2ad111cc am: ae5b2ddd68
Change-Id: I79a605ec6651700106087e2b314eef45489a18c9
|
2020-03-11 13:54:30 +00:00 |
|