Commit Graph

109066 Commits

Author SHA1 Message Date
TreeHugger Robot
7566ef277f Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 197b3072b5 am: 9d14efffd5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I131913f5f6915ce8bb5e17a2c93440b52ab00646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 12:06:46 +00:00
TreeHugger Robot
9ca268725f Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 2a34e48069 am: e18662f02a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I05377d92c003f279f79e19430d7e75310fadef8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 12:05:59 +00:00
TreeHugger Robot
9d14efffd5 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 197b3072b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: Icf3a52168eaa2bcfd4bcfa03e7d06fcbc26f4ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 11:30:47 +00:00
TreeHugger Robot
e18662f02a Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6 am: 2a34e48069
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I22871089af43978fe448825e37bbe7a1faa3e5f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 11:30:10 +00:00
TreeHugger Robot
197b3072b5 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I87164cccc6b47247bb4db42d122f301c75647d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 11:10:16 +00:00
TreeHugger Robot
2a34e48069 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634 am: ac572e72a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I8d2bd68530fc32cae6b354dd1e6c7df3ce3119b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 11:10:15 +00:00
TreeHugger Robot
ac572e72a6 Merge "Simplify the duplicate click checker logic" into tm-dev am: 02d3965634
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18515216

Change-Id: I0a317f53e6578ee245d54c3993267ab08d803161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 10:53:24 +00:00
TreeHugger Robot
02d3965634 Merge "Simplify the duplicate click checker logic" into tm-dev 2022-05-23 10:24:18 +00:00
Angela Wang
35387d3d4c Merge "Add a button to the accessibility button tutorial dialog that links directly to the settings page." 2022-05-23 07:00:33 +00:00
Bill Yi
66ed1dc370 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: 153aaf7682 -s ours am: 3304393c1b -s ours am: 476e1c93da -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: Ifba99c0a251b4f4b69b96cea067cb332c75e53ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 06:12:29 +00:00
Bill Yi
43717a0789 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: de1793faf0 -s ours am: a62ca13292 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: I878c4411a9616a3b064a84bc2c30d0be7c3200ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 06:11:28 +00:00
Bill Yi
51b428f889 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: c7bada8348 -s ours am: 9c89e876e7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: Ifde2954882cf3d23e0764a318409527a1b90395a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 06:10:01 +00:00
Bill Yi
476e1c93da [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: 153aaf7682 -s ours am: 3304393c1b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: Ib588cbf1f007dfe264e5956e9f366a179092adfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 05:47:42 +00:00
Bill Yi
a62ca13292 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: de1793faf0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: I8a1cee04c15721dea08f7877690e43f18d552eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 05:47:07 +00:00
Bill Yi
9c89e876e7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours am: c7bada8348 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: Ic5a21ecf04a60ccd53e9799c119a63f9fdcf3a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 05:45:20 +00:00
Bill Yi
3304393c1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: 153aaf7682 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: Id728bf2c000929f278e02cf915b05f78fcff9a82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 05:30:12 +00:00
Bill Yi
de1793faf0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: I93bd4dff9d8e5eb14a6c97ad61b8dace102f84b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 05:29:26 +00:00
Bill Yi
c7bada8348 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours am: c3d4eb094b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: I2494cb688e139ec769915b1bc092e98436ea806f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 05:29:03 +00:00
Bill Yi
c3d4eb094b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: I99b5282130809460605bf2af7a56d466b6752e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 05:09:38 +00:00
Bill Yi
153aaf7682 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 750cea242e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18544761

Change-Id: I2f2c0c4b54bccf5e3e6966297d08813d27aeac7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 05:08:17 +00:00
Jason Chiu
5bc2dc4ae9 Simplify the duplicate click checker logic
Test: manual
Bug: 215267159
Change-Id: I7724883b351d360525c51d31714b7e31855a6c82
2022-05-23 12:57:19 +08:00
Bill Yi
750cea242e Import translations. DO NOT MERGE ANYWHERE
BUG:233440940

Auto-generated-cl: translation import
Change-Id: Idbd4c9ec8105849b762afae06c780c47185fda65
2022-05-21 09:20:58 -07:00
Automerger Merge Worker
61544d8fa5 Merge changes from topic "am-2a6d18c09fae48e594f3db99e049d130" into tm-d1-dev-plus-aosp am: 7a395263d5 am: 6b24baab7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I09f7ebc6fee4e4ef1ab88e950c2bad73f8107bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:07:09 +00:00
TreeHugger Robot
6f658452ff [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 8c1aed12ee -s ours am: ca330b2b27 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I0e3da5a0304e902e3f2eac160b6da33f7ca90bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:07:08 +00:00
Automerger Merge Worker
8cc9b562f3 Merge changes from topic "am-2194a6a85b914b21804de4e27b3bc48e" into tm-qpr-dev-plus-aosp am: 0ef373f9b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: Idfd8580a3c112d52fdccaad4c3570a82f34891e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:06:50 +00:00
TreeHugger Robot
56df73ccc6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 85f117afe7 -s ours am: e24623e659 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I52ed5a347eefc85f311bee118bcf5844ada19fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:06:40 +00:00
TreeHugger Robot
6248cc7dc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: be66d387e9 -s ours am: c71ecb31e8 -s ours am: 871bb62065 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: Ie3bf0b118e9ccc9d145e37957babe318635046a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:06:26 +00:00
Bill Yi
326923e441 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: ea8b3f83b2 -s ours am: de09c13ece -s ours am: e6b3cbae50 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: Ica17ce743faad52b25d966b5a36b5442655e405c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:06:25 +00:00
Chaohui Wang
95d3d5c5ba Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 849dba46a3 am: bf393a9ac0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I045c68e4e91fd38ef868e281d77159edd7f1b91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:06:07 +00:00
Automerger Merge Worker
5135a801ac Merge "Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 52507eb518" into tm-qpr-dev-plus-aosp am: 429768bf64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I4dbc0e7c0cdcc66c4c5fab3df1387df072e1eaa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:05:44 +00:00
Chaohui Wang
008b8fdb5d Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 am: 456a27bee3 am: 3fdd89556e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: Iaee1a5e9407ff497682a3f0d79cb3851c24e04ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 03:05:19 +00:00
Automerger Merge Worker
6b24baab7d Merge changes from topic "am-2a6d18c09fae48e594f3db99e049d130" into tm-d1-dev-plus-aosp am: 7a395263d5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I1240818bbac7538c2d40b007c2eacb431d3e710a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:45:36 +00:00
TreeHugger Robot
ca330b2b27 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 8c1aed12ee -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I224af70b19e1b24c84092ae348d8f60d26da055e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:45:34 +00:00
Automerger Merge Worker
0ef373f9b9 Merge changes from topic "am-2194a6a85b914b21804de4e27b3bc48e" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 85f117afe7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours am: 08462bff56 -s ours
2022-05-21 02:45:22 +00:00
TreeHugger Robot
e24623e659 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours am: 85f117afe7 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I97a294f40583fdeafa80810aa8ccf0b5ff83351c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:45:18 +00:00
Bill Yi
3fe4babf13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours am: 08462bff56 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I82e27fa1eb240a3eec17e941e57a4bdb7aefea65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:45:17 +00:00
TreeHugger Robot
871bb62065 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: be66d387e9 -s ours am: c71ecb31e8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: Iabf1aa709f1aac7c0ae11d0a026a5026fbc3582e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:45:14 +00:00
Bill Yi
e6b3cbae50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: ea8b3f83b2 -s ours am: de09c13ece -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: Iefbdc6dd0d0efcda0fecd62c2887219fc549c1cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:45:13 +00:00
Chaohui Wang
bf393a9ac0 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 849dba46a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I7a069a4c0cf6a752c5391b70917718cb2f618dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:44:58 +00:00
Automerger Merge Worker
429768bf64 Merge "Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 52507eb518" into tm-qpr-dev-plus-aosp 2022-05-21 02:44:48 +00:00
Chaohui Wang
1dcd81b7b8 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c am: 52507eb518
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I9e578817811d5740d4372ac8b70b5137b7758b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:44:45 +00:00
Chaohui Wang
3fdd89556e Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: 0d6569d199 am: 456a27bee3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: I98d0c3ab385539d258baad72beb048aa0c563e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:44:42 +00:00
Automerger Merge Worker
7a395263d5 Merge changes from topic "am-2a6d18c09fae48e594f3db99e049d130" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours
2022-05-21 02:29:00 +00:00
TreeHugger Robot
8c1aed12ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I198c568a7c5ae92f0a86c1fd2dcdfea9609d0739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:55 +00:00
Bill Yi
3ffb54a1e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I25debac8937a771f3ef19488192f3c31bfc806c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:53 +00:00
TreeHugger Robot
c71ecb31e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: be66d387e9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: Iddb0b76e5d5ca58e1fd454bf552c5c33323ea62f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:51 +00:00
Bill Yi
de09c13ece [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: ea8b3f83b2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I973d31e95ee41c512eccd7b31dac06b962475afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:50 +00:00
TreeHugger Robot
85f117afe7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 97a3f54878 -s ours am: e393321e1f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: I51c05f2893d6960ebee8f69bf1f58dff78ba8caa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:42 +00:00
Bill Yi
08462bff56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26be41c615 -s ours am: b13cc8ca4c -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18522105

Change-Id: Ie1e2c966de5184a95caf8dd27e096b0c63bdb0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:41 +00:00
Chaohui Wang
849dba46a3 Merge "Fix Conversation page flickers when back" into tm-dev am: 0dc89bc85c am: f61254af3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490674

Change-Id: If64e9a2f5e885f90b949485a781f8dd6459a0984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-21 02:28:38 +00:00