OSDN Git Service
Fan Zhang [Thu, 20 Oct 2016 20:34:04 +0000 (20:34 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev am:
08254e5b4f
am:
723fbd06a9
Change-Id: Ief7d0f6e9d90c34f8b9405d4d13c4080f669c15c
Fan Zhang [Thu, 20 Oct 2016 20:33:51 +0000 (20:33 +0000)]
Fix help & feedback link in data usage summary screen. am:
9b52836251
am:
7568e120cf
Change-Id: If7768bdf34204ca158dcf7e2078826a0aabc2ec7
Fan Zhang [Thu, 20 Oct 2016 20:25:38 +0000 (20:25 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
am:
08254e5b4f
Change-Id: Ia9c30a0a03a1dcaec42573c3578f5a1ed80aa9b6
Fan Zhang [Thu, 20 Oct 2016 20:25:37 +0000 (20:25 +0000)]
Fix help & feedback link in data usage summary screen.
am:
9b52836251
Change-Id: I1417eebbf5218baa24a79f2f1988844b8d06d674
TreeHugger Robot [Thu, 20 Oct 2016 20:18:44 +0000 (20:18 +0000)]
Merge "Fix help & feedback link in data usage summary screen." into nyc-mr1-dev
Bill Yi [Thu, 20 Oct 2016 16:41:12 +0000 (16:41 +0000)]
Import translations. DO NOT MERGE am:
4bfccb32a7 -s ours am:
4559d2bfac -s ours
am:
d0c5d246c8 -s ours
Change-Id: Ic8230d57c512c2ccbc54be5061caac490bcbe6d4
Bill Yi [Thu, 20 Oct 2016 16:33:20 +0000 (16:33 +0000)]
Import translations. DO NOT MERGE am:
4bfccb32a7 -s ours
am:
4559d2bfac -s ours
Change-Id: Iff8ca804ae251a0462f148a236e7b4e8c9dd3e4d
Bill Yi [Thu, 20 Oct 2016 16:25:35 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE
am:
4bfccb32a7 -s ours
Change-Id: I7c16649111b0057307773f7674c11c1aa9732c4c
Bill Yi [Thu, 20 Oct 2016 16:25:23 +0000 (16:25 +0000)]
Import translations. DO NOT MERGE am:
7e6e9220da -s ours
am:
d5bc80036b -s ours
Change-Id: I147e0e6546f7d367ff81d45bc66e7829bcf45267
Bill Yi [Thu, 20 Oct 2016 16:17:21 +0000 (16:17 +0000)]
Import translations. DO NOT MERGE
am:
7e6e9220da -s ours
Change-Id: Ibe7e7a4797602978d09a44aab39f49045f029748
Fan Zhang [Thu, 20 Oct 2016 16:06:12 +0000 (09:06 -0700)]
Fix help & feedback link in data usage summary screen.
The fragment was not providing the correct string for help & feedback
button, causing no result page when user navigates to help article page
from actionbar overflow menu.
Change-Id: I076846c44d4fc95efea743f019a7ad4aab47f214
Fixes:
32291069
Test: manual
Bill Yi [Thu, 20 Oct 2016 14:52:52 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2490d08d85215767e05bf193c3e352c3ab7a7ce9
Auto-generated-cl: translation import
Bill Yi [Thu, 20 Oct 2016 14:48:07 +0000 (07:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I60964278429db5003b317b04e53324fc312116d5
Auto-generated-cl: translation import
Anna Galusza [Thu, 20 Oct 2016 03:46:56 +0000 (03:46 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev am:
ee502d5037
am:
b104675957
Change-Id: Id3c38bf0f288ec55bdedb2029eac7c713773c4a9
Anna Galusza [Thu, 20 Oct 2016 03:46:42 +0000 (03:46 +0000)]
Fix insufficint contrast on Vision Settings toggles. am:
e212817785
am:
5bf1f668ff
Change-Id: I0ac8ad8d8cd0091224c2bf1a76ac4845b4c6cf31
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
am:
ee502d5037
Change-Id: I23a6c8eb6911902fc9b9ecab8bb87e38c73371b5
Anna Galusza [Thu, 20 Oct 2016 03:38:11 +0000 (03:38 +0000)]
Fix insufficint contrast on Vision Settings toggles.
am:
e212817785
Change-Id: I9969b046d52d6aff86fe6b0f5d44cce2cf49e8dd
Anna Galusza [Thu, 20 Oct 2016 03:32:22 +0000 (03:32 +0000)]
Merge "Fix insufficint contrast on Vision Settings toggles." into nyc-mr1-dev
Anna Galusza [Mon, 17 Oct 2016 19:23:08 +0000 (12:23 -0700)]
Fix insufficint contrast on Vision Settings toggles.
Bug:
29161887
Change-Id: I633ed3cf0fa00d3b697377118580471afaf30132
Adrian Roos [Tue, 18 Oct 2016 22:43:36 +0000 (22:43 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev am:
ee5eef1492
am:
f33b98b750
Change-Id: I61777d38647d8b6f858de9feadf7ae3c8a9b7ebd
Adrian Roos [Tue, 18 Oct 2016 22:19:52 +0000 (22:19 +0000)]
Separate ambient display triggers am:
82829ee0b1
am:
5ba2074e31
Change-Id: I023918a3d862502de6a4058609e29b8867e39f0c
Adrian Roos [Tue, 18 Oct 2016 22:16:39 +0000 (22:16 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
am:
ee5eef1492
Change-Id: Id045b4f47d8052b8e058522d69d91f9e1a9bba48
Adrian Roos [Tue, 18 Oct 2016 22:07:11 +0000 (22:07 +0000)]
Separate ambient display triggers
am:
82829ee0b1
Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62
Adrian Roos [Tue, 18 Oct 2016 22:00:04 +0000 (22:00 +0000)]
Merge "Separate ambient display triggers" into nyc-mr1-dev
Lei Yu [Tue, 18 Oct 2016 17:09:29 +0000 (17:09 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev am:
7fee46383f
am:
b4969f5b6f
Change-Id: I81cf5f1bef06b9e3307df38d2e9e942f4be5f1e7
jackqdyulei [Tue, 18 Oct 2016 17:09:15 +0000 (17:09 +0000)]
Suspend action in security patch when browser is disabled am:
013da34209
am:
221b9157b4
Change-Id: I09d1111f49a9d658629c2f1def0c1ed45f7b0ec4
Lei Yu [Tue, 18 Oct 2016 16:54:04 +0000 (16:54 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
am:
7fee46383f
Change-Id: I0adb924d05bed16bb6415f2b8edf69e509d7fe72
jackqdyulei [Tue, 18 Oct 2016 16:54:03 +0000 (16:54 +0000)]
Suspend action in security patch when browser is disabled
am:
013da34209
Change-Id: I408fadd1b4d5a3455eb70dc808efe18e258f26c0
Lei Yu [Tue, 18 Oct 2016 16:45:35 +0000 (16:45 +0000)]
Merge "Suspend action in security patch when browser is disabled" into nyc-mr1-dev
Bill Yi [Tue, 18 Oct 2016 05:49:41 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE am:
6515783df6 -s ours am:
37c5dd0fe3 -s ours
am:
a95e430c93 -s ours
Change-Id: I5704704614d94e10c1e5445d93fa28d584998d23
Bill Yi [Tue, 18 Oct 2016 05:49:22 +0000 (05:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am:
5ffabbe58b -s ours
am:
987866df87 -s ours
Change-Id: I004b43f4084e804c79e5b75b2e61448ecb4b0bdf
Bill Yi [Tue, 18 Oct 2016 05:49:02 +0000 (05:49 +0000)]
Import translations. DO NOT MERGE am:
ccde0787b8 -s ours
am:
4367ed325e -s ours
Change-Id: I10c8b1a9a393fa87343ebc2802232f246357b9b8
Bill Yi [Tue, 18 Oct 2016 05:40:29 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE am:
6515783df6 -s ours
am:
37c5dd0fe3 -s ours
Change-Id: Ia6d04b243b2338687963f234374d44a76a8bfae8
Bill Yi [Tue, 18 Oct 2016 05:40:02 +0000 (05:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
5ffabbe58b -s ours
Change-Id: I97a96da052f14ecd9901ef7aee42cfdbaf284cbf
Bill Yi [Tue, 18 Oct 2016 05:40:01 +0000 (05:40 +0000)]
Import translations. DO NOT MERGE
am:
ccde0787b8 -s ours
Change-Id: I7ee7d06fa217a520809ade396be78dddc63b3109
Bill Yi [Tue, 18 Oct 2016 05:37:33 +0000 (05:37 +0000)]
Import translations. DO NOT MERGE
am:
6515783df6 -s ours
Change-Id: I4afd6c7910dde3c52771687f6fa8bfbe55e56894
TreeHugger Robot [Tue, 18 Oct 2016 05:30:53 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
jackqdyulei [Fri, 14 Oct 2016 20:53:14 +0000 (13:53 -0700)]
Suspend action in security patch when browser is disabled
When queryIntentActivities(intent, flag) return empty, don't send out
that intent to stop crash. This is a special catch only in security
patch.
Bug:
32054067
Test: Manual, hard to mock the situation to disable all the apps for
a specific action.
Change-Id: Ibc96b814a4170926972cff8e0bc954ea57b33c10
Adrian Roos [Fri, 14 Oct 2016 20:03:55 +0000 (13:03 -0700)]
Separate ambient display triggers
Allows configuring notification and sensor triggers
separately. Introduces a helper class that hosts the
logic for determining what kinds of triggers a device
supports.
Bug:
32073185
Change-Id: Ie7e8eb6b895dcc54e6f972e70642c7248b9e223a
Test: disable "ambient display", sensor triggers should still work
Bill Yi [Mon, 17 Oct 2016 20:26:38 +0000 (13:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib4de644f9065e553dfd28458421aaba309a41de5
Auto-generated-cl: translation import
Doris Ling [Mon, 17 Oct 2016 20:24:34 +0000 (20:24 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev am:
ec5314f2f5
am:
1a674eef53
Change-Id: I5fe058f76e3a7061fc78fe02294f0cd802534cde
Doris Ling [Mon, 17 Oct 2016 20:24:26 +0000 (20:24 +0000)]
Add static preview images to gesture settings. am:
12e4bebabf
am:
df7b815980
Change-Id: I56c1f9368bb762e400e0a071e72dd175351a7696
Bill Yi [Mon, 17 Oct 2016 20:21:09 +0000 (13:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I85609bede92b4ae044f1f98a101576447f93367f
Auto-generated-cl: translation import
Doris Ling [Mon, 17 Oct 2016 20:18:33 +0000 (20:18 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
am:
ec5314f2f5
Change-Id: Ib195aa98f9838ceffc27255e34b18e2bdfbccbff
Doris Ling [Mon, 17 Oct 2016 20:18:30 +0000 (20:18 +0000)]
Add static preview images to gesture settings.
am:
12e4bebabf
Change-Id: I4f5f16b109c4997b15b93320945bbb3ccab06735
Doris Ling [Mon, 17 Oct 2016 20:11:31 +0000 (20:11 +0000)]
Merge "Add static preview images to gesture settings." into nyc-mr1-dev
Sanket Padawe [Mon, 17 Oct 2016 17:25:04 +0000 (17:25 +0000)]
Fix multi-sim popup issue in data usage. am:
8591f26fa3
am:
d8fc77122b
Change-Id: Idbe5e19e8ce5660e4a056b28917fccca5477cc9e
Sanket Padawe [Mon, 17 Oct 2016 17:18:34 +0000 (17:18 +0000)]
Fix multi-sim popup issue in data usage.
am:
8591f26fa3
Change-Id: If23388f4fb2211af239aef7043cceb2ec2dd13e8
Sanket Padawe [Fri, 14 Oct 2016 22:41:52 +0000 (15:41 -0700)]
Fix multi-sim popup issue in data usage.
+ Avoid sending popup dialog when data is enabled on currently active
data sim.
Bug:
31736014
Change-Id: I60e9e049f546cb176283bc4c4e20cb2d3e7ac386
Bill Yi [Fri, 14 Oct 2016 09:29:39 +0000 (09:29 +0000)]
Import translations. DO NOT MERGE am:
43920d3ba5 -s ours am:
1146d6375c -s ours
am:
11d7cba3b2 -s ours
Change-Id: I4a666011cda0542627d55677ed4bbe26378e2804
Bill Yi [Fri, 14 Oct 2016 09:29:25 +0000 (09:29 +0000)]
Import translations. DO NOT MERGE am:
18a64f201b -s ours
am:
fceb2818d6 -s ours
Change-Id: I5bc44f819b0dcc27aa5dcd411bed23eda90ec733
Bill Yi [Fri, 14 Oct 2016 09:22:56 +0000 (09:22 +0000)]
Import translations. DO NOT MERGE am:
43920d3ba5 -s ours
am:
1146d6375c -s ours
Change-Id: I973f3606e3f7427f74c9af29d58ba0611b865704
Bill Yi [Fri, 14 Oct 2016 09:21:26 +0000 (09:21 +0000)]
Import translations. DO NOT MERGE
am:
43920d3ba5 -s ours
Change-Id: I72f1d361a29a4391c33c5fd0fb8a3340287314f9
Bill Yi [Fri, 14 Oct 2016 09:20:40 +0000 (09:20 +0000)]
Import translations. DO NOT MERGE
am:
18a64f201b -s ours
Change-Id: I91b138778b8488b63afa11c1c6625f7a72acbd62
Bill Yi [Thu, 13 Oct 2016 22:35:00 +0000 (15:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia1b89602b4538d719cf4b4c2285290598a9d60f6
Auto-generated-cl: translation import
Bill Yi [Thu, 13 Oct 2016 22:30:06 +0000 (15:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: If676bfdcdc338204bedc7a678042d214d0cbc0a3
Auto-generated-cl: translation import
Qi Ding [Thu, 13 Oct 2016 01:34:08 +0000 (01:34 +0000)]
Merge "Fix searched item isn't highlighted" am:
363c529dc6 am:
1d07de566d
am:
85768b3723
Change-Id: I7bb1c3b3a5dbb1ee4e6d8934a7be542076d1e863
Qi Ding [Thu, 13 Oct 2016 01:28:00 +0000 (01:28 +0000)]
Merge "Fix searched item isn't highlighted" am:
363c529dc6
am:
1d07de566d
Change-Id: I908c237db46ffcca743b66dd1c5fa5b0fab17a06
Qi Ding [Thu, 13 Oct 2016 01:19:49 +0000 (01:19 +0000)]
Merge "Fix searched item isn't highlighted"
am:
363c529dc6
Change-Id: I57e09b8403422338c80bd369d41822bf26383361
Treehugger Robot [Thu, 13 Oct 2016 01:13:41 +0000 (01:13 +0000)]
Merge "Fix searched item isn't highlighted"
Daniel Sandler [Wed, 12 Oct 2016 13:58:04 +0000 (13:58 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev am:
0f6ae3aa87
am:
93622202d3
Change-Id: I8fa5d3437be488fa3c5f1d57a2032636d4fcd6b1
Dan Sandler [Wed, 12 Oct 2016 13:57:49 +0000 (13:57 +0000)]
Suppress notif block/silence settings for essential packages. am:
acf763e996
am:
80df316ac4
Change-Id: I6c8b6133ab088362974df5c19d3b93d2862f8c92
Daniel Sandler [Wed, 12 Oct 2016 13:51:05 +0000 (13:51 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
am:
0f6ae3aa87
Change-Id: I87fbb0cd4c462a7df76e2f5719aafc54ee671076
Dan Sandler [Wed, 12 Oct 2016 13:51:04 +0000 (13:51 +0000)]
Suppress notif block/silence settings for essential packages.
am:
acf763e996
Change-Id: I2c88494c5d1df2075bc56ed10aa88b41d6ec6113
Daniel Sandler [Wed, 12 Oct 2016 13:38:56 +0000 (13:38 +0000)]
Merge "Suppress notif block/silence settings for essential packages." into nyc-mr1-dev
Doris Ling [Wed, 12 Oct 2016 00:36:05 +0000 (00:36 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev am:
49c0bab8bf
am:
739a261295
Change-Id: I25ceb867e68720f22405a944669c5fc9ca3570f4
Doris Ling [Wed, 12 Oct 2016 00:35:58 +0000 (00:35 +0000)]
Remove pickup gesture settings if sensor is not found. am:
94e0da52fc
am:
79aa718669
Change-Id: Ibd7ad376e17c8a612b87909ffe87e75bb242c3a0
Doris Ling [Wed, 12 Oct 2016 00:23:48 +0000 (00:23 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
am:
49c0bab8bf
Change-Id: I8cf7ab7f80ea97249425e8da2fae6c2e88affd99
Doris Ling [Wed, 12 Oct 2016 00:23:46 +0000 (00:23 +0000)]
Remove pickup gesture settings if sensor is not found.
am:
94e0da52fc
Change-Id: Iaca5d323b7cda84ca3ed822babe150fc517f1ce9
Doris Ling [Fri, 30 Sep 2016 19:41:26 +0000 (12:41 -0700)]
Add static preview images to gesture settings.
Set the animation preview image view to the newly added preview image
instead of loading it from animation video.
Test: manual - launch gesture settings and visually check the animation
preview images.
Bug:
31636637
Change-Id: If25a0e3501bea0c6343326a143d665ec79e3d7c7
Doris Ling [Tue, 11 Oct 2016 23:42:41 +0000 (23:42 +0000)]
Merge "Remove pickup gesture settings if sensor is not found." into nyc-mr1-dev
Doris Ling [Tue, 11 Oct 2016 21:19:03 +0000 (14:19 -0700)]
Remove pickup gesture settings if sensor is not found.
Update gesture settings to check for available pickup sensor before
showing pickup gesture settings.
Test: manual - launch gesture settings on different device and check for
pickup preference. Auto test pending.
Bug:
32072298
Change-Id: Iaab0290dcfeb2b0c9195df685f225d092a658347
Nick Kralevich [Tue, 11 Oct 2016 18:28:05 +0000 (18:28 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev am:
09d3961326
am:
2c89007df6
Change-Id: Iaddfa85f013b44648b12fed164e26d02251471fc
Nick Kralevich [Tue, 11 Oct 2016 18:14:34 +0000 (18:14 +0000)]
Delete "Show CPU usage" am:
73dfef91b2
am:
0f3067ce58
Change-Id: Ic7a08dfa404e8dc35feb17187fe7067ee868c715
Nick Kralevich [Tue, 11 Oct 2016 18:14:06 +0000 (18:14 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
am:
09d3961326
Change-Id: Iaa4e4d01ca8a1543994d9ca422991cc25a36d819
Nick Kralevich [Tue, 11 Oct 2016 18:09:16 +0000 (18:09 +0000)]
Delete "Show CPU usage"
am:
73dfef91b2
Change-Id: I3bf3ab7c241980f21ae0b648db4e0e4065d3b848
Nick Kralevich [Tue, 11 Oct 2016 18:03:25 +0000 (18:03 +0000)]
Merge "Delete "Show CPU usage"" into nyc-mr1-dev
Nick Kralevich [Tue, 11 Oct 2016 16:03:29 +0000 (09:03 -0700)]
Delete "Show CPU usage"
This functionality hasn't worked since Lollipop.
Bug:
21388590
Change-Id: Ie3684ba0f8b3a5f577462e4cc4a1ceba53931eff
Bill Yi [Tue, 11 Oct 2016 15:14:56 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am:
64d3e22e11 -s ours am:
9f8644c04f -s ours
am:
d13a041835 -s ours
Change-Id: Ibcfcbaa91d51944f0861d0f65e50461004db8779
Bill Yi [Tue, 11 Oct 2016 15:14:42 +0000 (15:14 +0000)]
Import translations. DO NOT MERGE am:
6acf691f62 -s ours
am:
557f83edb5 -s ours
Change-Id: I4d4f4c323c27dced0088b588567c7b42f3acb3e1
Bill Yi [Tue, 11 Oct 2016 15:09:26 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE am:
64d3e22e11 -s ours
am:
9f8644c04f -s ours
Change-Id: I7dc4c1f300dd8a3afdd55cca1224c81e83528478
Bill Yi [Tue, 11 Oct 2016 15:09:11 +0000 (15:09 +0000)]
Import translations. DO NOT MERGE
am:
6acf691f62 -s ours
Change-Id: I2e8466a2baab0727b0a03ab96589cb0a1bd312a3
Bill Yi [Tue, 11 Oct 2016 15:03:11 +0000 (15:03 +0000)]
Import translations. DO NOT MERGE
am:
64d3e22e11 -s ours
Change-Id: Ib8ac9eb3a836caf8e4c239c0caa99ca1c9ec0948
Bill Yi [Mon, 10 Oct 2016 19:39:26 +0000 (12:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5616dbd321f70984c0386fd5b2e48f608ede25cb
Auto-generated-cl: translation import
Bill Yi [Mon, 10 Oct 2016 19:31:59 +0000 (12:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic1133c6ddf9e2230e189751a04c58b953ef2b4c5
Auto-generated-cl: translation import
Salvador Martinez [Fri, 7 Oct 2016 21:08:47 +0000 (21:08 +0000)]
Fixed spans getting stripped from disclaimer am:
e0b74a6de0
am:
e3c31f3aec
Change-Id: Ia05205f27bdaccd7f08e311ef0c24a0af1776f64
Salvador Martinez [Fri, 7 Oct 2016 21:04:16 +0000 (21:04 +0000)]
Fixed spans getting stripped from disclaimer
am:
e0b74a6de0
Change-Id: I5b668306d5e6221f47903179b58ce9b227d6a940
Salvador Martinez [Fri, 7 Oct 2016 02:26:51 +0000 (19:26 -0700)]
Fixed spans getting stripped from disclaimer
In the support disclaimer the text
"Privacy Policy" and "Terms of Service"
will no longer have their url spans
stripped.
Test: Instrumentation Test
Bug:
31939039
Change-Id: Ifdd9c3b5249d4678b30e677b909d0b58dd2c5edc
Matthew Fritze [Thu, 6 Oct 2016 22:53:47 +0000 (22:53 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev am:
9f95a59b88
am:
d983045488
Change-Id: I67fd24b1e7647f0216983d5a16f868c16a90cadc
Matthew Fritze [Thu, 6 Oct 2016 22:53:33 +0000 (22:53 +0000)]
The center column of the support tab is back to white am:
2d07290453
am:
409714d0e4
Change-Id: I6af46ec8fdba17edbb2716704e903c7aedb7d456
Matthew Fritze [Thu, 6 Oct 2016 22:49:58 +0000 (22:49 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
am:
9f95a59b88
Change-Id: Ic7948520f75b0b8024d9239a87734ae6fa003705
Matthew Fritze [Thu, 6 Oct 2016 22:49:56 +0000 (22:49 +0000)]
The center column of the support tab is back to white
am:
2d07290453
Change-Id: I14bb5ca55ed267b3144a091e5b0bc636aeaaaa1e
Salvador Martinez [Thu, 6 Oct 2016 22:46:46 +0000 (22:46 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev am:
8a468ccbdf
am:
17866f0b17
Change-Id: Icc7ae5e2d553a2ef9ad8d568b0e2d90a393256b1
Salvador Martinez [Thu, 6 Oct 2016 22:46:32 +0000 (22:46 +0000)]
Added onClick logic for domain url list screen am:
26e5760033
am:
1d383e1220
Change-Id: Ib1e58b680a866dea0b4ac398215d94f6c636f1cc
Matthew Fritze [Thu, 6 Oct 2016 22:43:28 +0000 (22:43 +0000)]
Merge "The center column of the support tab is back to white" into nyc-mr1-dev
Salvador Martinez [Thu, 6 Oct 2016 22:42:57 +0000 (22:42 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
am:
8a468ccbdf
Change-Id: Iffe25be2bb7623d3529feb8d0bd115c7b423db72
Salvador Martinez [Thu, 6 Oct 2016 22:42:56 +0000 (22:42 +0000)]
Added onClick logic for domain url list screen
am:
26e5760033
Change-Id: I11428c85ef077b7eee6ec7b6722463e86ac21a9b
Salvador Martinez [Thu, 6 Oct 2016 22:37:05 +0000 (22:37 +0000)]
Merge "Added onClick logic for domain url list screen" into nyc-mr1-dev
Bill Yi [Thu, 6 Oct 2016 21:55:00 +0000 (21:55 +0000)]
Import translations. DO NOT MERGE am:
a6b32526d7 -s ours
am:
f6a7a97ab5 -s ours
Change-Id: I51cf96a100e1a84bbc8fbd6dc5ce26b66056ec12
Fan Zhang [Thu, 6 Oct 2016 21:54:46 +0000 (21:54 +0000)]
Merge "Fix a NPE in confirm lock screen." into nyc-mr1-dev am:
6cea122bfc
am:
207bb2947e
Change-Id: Ied103f6707f804a8b386d0f0d3df1837c5b98571
OSDN Git Service
