Bill Yi
60af01bec9
Merge "Import translations. DO NOT MERGE" into oc-dev
...
am: 69ca32dcea
2017-09-18 20:07:14 +00:00
Bill Yi
c49cdb6749
Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours
...
am: 456c147827
2017-09-18 19:56:59 +00:00
TreeHugger Robot
69ca32dcea
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-09-18 19:31:18 +00:00
Bill Yi
456c147827
Import translations. DO NOT MERGE am: 791ebeed32 -s ours
...
am: fee3748d04
2017-09-18 19:16:08 +00:00
Bill Yi
fee3748d04
Import translations. DO NOT MERGE
...
am: 791ebeed32
2017-09-18 19:09:21 +00:00
Julia Reynolds
beb14f16fd
Merge "Fix nomanservice notificationrecord leak" into oc-dev
...
am: 9c32669043
2017-09-18 18:09:02 +00:00
fionaxu
6e40562a73
resolve merge conflicts of 6df58d8da1 to oc-dr1-dev
...
Test: I solemnly swear I tested this conflict resolution.
Bug: 65113738
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Change-Id: I100ef303e5e50ddac12bc2e9f1dbeb21d6b801aa
2017-09-18 17:57:45 +00:00
TreeHugger Robot
9c32669043
Merge "Fix nomanservice notificationrecord leak" into oc-dev
2017-09-18 17:35:06 +00:00
Bill Yi
2442fd43bf
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 64712476
Change-Id: I6a56e46644120a42a4a0cff43dfd5f8b61ca6f8f
2017-09-18 08:21:35 -07:00
Bill Yi
791ebeed32
Import translations. DO NOT MERGE
...
Change-Id: Icff28a8957c2a3192b2aeaf0d646c866eb2ebbd8
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-09-17 22:12:38 -07:00
Chen Xu
6df58d8da1
Merge "disable carrier actions on redirection by default" into oc-dev
2017-09-15 17:54:26 +00:00
fionaxu
1aedcdd075
disable carrier actions on redirection by default
...
1. the assumption of "carrier will redirect users to their captive
portal page when users dont have data plan" might not be true for all
carriers. We have seem issues like carriers random redirect users when
they still have balance left.
2. turn this off by default and turn it on if the carrier is
behaving correctly and agree with it.
Merged-in: I6bc2d8ba45958eaf09e09e3ea2e57c79e0ac461e
Merged-in: I445c7bce01e0bf36214f5f4f6327a0582c774dae
Bug: 65113738
Test: Manual
Change-Id: I60be2de3aa227298e60ea7eb9535bad8967b1fe3
2017-09-15 00:47:48 +00:00
Kevin Hufnagle
91fb9b2a16
Merge "docs: updated link on RemoteInput page" into oc-dev
...
am: 6087b990df
2017-09-15 00:42:20 +00:00
Kevin Hufnagle
6087b990df
Merge "docs: updated link on RemoteInput page" into oc-dev
2017-09-15 00:12:41 +00:00
Beverly Tai
fe5ce91c5f
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
...
am: d740b2d09a
2017-09-14 19:00:40 +00:00
Beverly Tai
d740b2d09a
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into oc-dev
2017-09-14 18:49:00 +00:00
Beverly Tai
b237ea7cc8
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3 -s ours am: 26e84466d3 -s ours
...
am: 9bc160cc3d
2017-09-14 18:11:18 +00:00
Beverly Tai
c3e2d40309
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev am: 121d3b89f7 -s ours
...
am: 95e10b296e
2017-09-14 18:00:56 +00:00
Beverly Tai
9bc160cc3d
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b am: 68f91528c3 -s ours
...
am: 26e84466d3
2017-09-14 18:00:15 +00:00
Beverly Tai
a35989b007
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b am: ba55b3bea6 -s ours
...
am: ef696aa47b
2017-09-14 17:51:28 +00:00
Beverly Tai
95e10b296e
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev
...
am: 121d3b89f7
2017-09-14 17:50:15 +00:00
Beverly Tai
26e84466d3
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev am: 61bc3f3c9b
...
am: 68f91528c3
2017-09-14 17:44:23 +00:00
Beverly Tai
ef696aa47b
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2 am: 8462da779b
...
am: ba55b3bea6
2017-09-14 17:40:12 +00:00
Beverly Tai
121d3b89f7
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr2-dev
2017-09-14 17:34:14 +00:00
Beverly Tai
ba55b3bea6
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours am: 0a93f42be2
...
am: 8462da779b
2017-09-14 17:29:37 +00:00
Beverly Tai
68f91528c3
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
...
am: 61bc3f3c9b
2017-09-14 17:25:25 +00:00
Beverly Tai
8462da779b
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8 am: 3be1269c0a -s ours
...
am: 0a93f42be2
2017-09-14 17:21:42 +00:00
Beverly Tai
61bc3f3c9b
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-mr1-dev
2017-09-14 17:16:48 +00:00
Beverly Tai
0a93f42be2
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev am: 0bdb7902d8
...
am: 3be1269c0a
2017-09-14 17:14:13 +00:00
Beverly Tai
3be1269c0a
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
...
am: 0bdb7902d8
2017-09-14 16:46:42 +00:00
Beverly Tai
0bdb7902d8
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into nyc-dev
2017-09-14 16:40:01 +00:00
Beverly Tai
a62951f28f
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61 am: a126d94892 -s ours
...
am: 2435c816d8
2017-09-14 15:19:03 +00:00
Beverly Tai
2435c816d8
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9 am: e148e39d61
...
am: a126d94892
2017-09-14 15:10:05 +00:00
Beverly Tai
a126d94892
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2 am: 0bf81b63f9
...
am: e148e39d61
2017-09-14 15:03:04 +00:00
Beverly Tai
e148e39d61
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92 am: 9a74d618c2
...
am: 0bf81b63f9
2017-09-14 14:55:33 +00:00
Beverly Tai
0bf81b63f9
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours am: b004901c92
...
am: 9a74d618c2
2017-09-14 14:50:33 +00:00
Beverly Tai
9a74d618c2
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c am: d54bc6a908 -s ours
...
am: b004901c92
2017-09-14 14:43:40 +00:00
Beverly Tai
b004901c92
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee am: 97b98a3b1c
...
am: d54bc6a908
2017-09-14 14:35:34 +00:00
Beverly Tai
d54bc6a908
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev am: 8150eb82ee
...
am: 97b98a3b1c
2017-09-14 14:29:56 +00:00
Beverly Tai
97b98a3b1c
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
...
am: 8150eb82ee
2017-09-14 14:25:02 +00:00
Beverly Tai
8150eb82ee
Merge "DO NOT MERGE Backporting potential usb tapjacking precaution." into mnc-dr-dev
2017-09-14 14:18:07 +00:00
Bill Yi
abc3417961
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 5b812c8df6 -s ours am: 98313f5996 -s ours
...
am: 95dd448a5e
2017-09-14 01:05:27 +00:00
Bill Yi
ea94475791
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b53e9cf4a2 -s ours am: 8eb6ff0212 -s ours
...
am: c8ede1e966
2017-09-14 01:00:57 +00:00
Bill Yi
1186c6ec45
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c00cf0a49d -s ours am: 2b492b6502 -s ours
...
am: 8d1cdbb135
2017-09-14 00:53:06 +00:00
Bill Yi
3989c8b1f7
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7cc053233b -s ours am: fc0a43743e -s ours
...
am: 8d0a15c4f5
2017-09-14 00:49:39 +00:00
Bill Yi
2dd51799b2
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7804b17f0e -s ours am: b7c6238556 -s ours
...
am: a690e7362d
2017-09-14 00:37:57 +00:00
Bill Yi
9ebfe48df5
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: b69531f99e -s ours am: 16bc5f15b7 -s ours
...
am: 69259c2b32
2017-09-14 00:28:00 +00:00
Bill Yi
bcbc39e695
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 37f29b0359 -s ours am: 4f8b486f69 -s ours
...
am: 0dd2e975ca
2017-09-14 00:23:39 +00:00
Bill Yi
797dca48c9
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: f9075cb448 -s ours am: c0ccea9bf5 -s ours
...
am: 4e72aa2314
2017-09-14 00:17:51 +00:00
Bill Yi
0973e9a34e
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c016ef25c8 -s ours am: 318728fd6b -s ours
...
am: 9ce3cc9c78
2017-09-14 00:11:20 +00:00
