Andrew Sapperstein
784e04e574
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d am: 3b30cbee7d -s ours
...
am: 280e3cc0d7
2017-07-27 06:49:50 +00:00
Android Build Merger (Role)
5bbef78325
Merge "Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d -s ours am: 97ca7e473a -s ours" into oc-mr1-dev-plus-aosp
2017-07-27 05:44:43 +00:00
Andrew Sapperstein
3ff668617f
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d -s ours
...
am: 97ca7e473a
2017-07-27 05:44:26 +00:00
Andrew Sapperstein
280e3cc0d7
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am: 3bd56d970d
...
am: 3b30cbee7d
2017-07-27 05:44:25 +00:00
Andrew Sapperstein
3b30cbee7d
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
...
am: 3bd56d970d
2017-07-27 05:41:58 +00:00
Andrew Sapperstein
97ca7e473a
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
...
am: 3bd56d970d
2017-07-27 05:41:56 +00:00
TreeHugger Robot
3bd56d970d
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
2017-07-27 05:37:49 +00:00
Bill Yi
0d134a61cc
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: e3e1e7b9d4 -s ours am: a9fc19e385 -s ours
...
am: 4baa6ce625
2017-07-27 05:32:37 +00:00
Andrew Sapperstein
ae41c1b670
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef am: fe35c40dad
...
am: b0b1bdd02b
2017-07-27 05:32:16 +00:00
Bill Yi
673ef15909
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours am: 1602913a75 -s ours
...
am: d8667dba08
2017-07-27 05:31:51 +00:00
Matthew Fritze
a495e6e718
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e am: 9092e1a0b0
...
am: ece8c7bfe7
2017-07-27 05:31:26 +00:00
jackqdyulei
cebd4397ae
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92 am: 75e89dfede
...
am: 418bd11db3
2017-07-27 05:30:58 +00:00
Andrew Sapperstein
71902daa81
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef am: 1ee62c16a3
...
am: df916872c1
2017-07-27 05:30:09 +00:00
Bill Yi
32bb4393e0
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours am: ef36ef28d9 -s ours
...
am: 97bed117da
2017-07-27 05:29:41 +00:00
Matthew Fritze
9deb3f3c54
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e am: 68617a6f42
...
am: cba96eb672
2017-07-27 05:29:20 +00:00
Doris Ling
409091c5c9
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev am: 8e13218ec8
...
am: e866cd4825
2017-07-27 05:28:52 +00:00
jackqdyulei
24f6fc8b05
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92 am: 063e87c689
...
am: 220b1f163a
2017-07-27 05:28:27 +00:00
Andrew Sapperstein
151fb83ea6
Merge "Add ambient notifications as inline setting." into oc-mr1-dev am: 5d7fab4f22
...
am: 8f25bc916a
2017-07-27 05:27:57 +00:00
Bill Yi
4baa6ce625
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: e3e1e7b9d4 -s ours
...
am: a9fc19e385
2017-07-27 02:15:58 +00:00
Andrew Sapperstein
b0b1bdd02b
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
...
am: fe35c40dad
2017-07-27 02:15:36 +00:00
Bill Yi
d8667dba08
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours
...
am: 1602913a75
2017-07-27 02:15:13 +00:00
Matthew Fritze
ece8c7bfe7
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e
...
am: 9092e1a0b0
2017-07-27 02:14:54 +00:00
jackqdyulei
418bd11db3
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
...
am: 75e89dfede
2017-07-27 02:14:28 +00:00
Ryusuke Sawa
a15be47bd5
Show Error dialog when WPS is interrupted
...
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.
Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on
Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09:00
Andrew Sapperstein
df916872c1
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am: 7b445d59ef
...
am: 1ee62c16a3
2017-07-27 01:36:57 +00:00
Bill Yi
97bed117da
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours am: b0126e3500 -s ours
...
am: ef36ef28d9
2017-07-27 01:36:32 +00:00
Matthew Fritze
cba96eb672
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am: c2cb0d0b9e
...
am: 68617a6f42
2017-07-27 01:35:04 +00:00
Doris Ling
e866cd4825
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
...
am: 8e13218ec8
2017-07-27 01:33:52 +00:00
jackqdyulei
220b1f163a
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
...
am: 063e87c689
2017-07-27 01:33:28 +00:00
Andrew Sapperstein
8f25bc916a
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
...
am: 5d7fab4f22
2017-07-27 01:32:37 +00:00
Bill Yi
a9fc19e385
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
...
am: e3e1e7b9d4
2017-07-27 01:24:51 +00:00
Andrew Sapperstein
1ee62c16a3
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
...
am: 7b445d59ef
2017-07-27 01:21:05 +00:00
Bill Yi
ef36ef28d9
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
...
am: b0126e3500
2017-07-27 01:20:25 +00:00
Andrew Sapperstein
fe35c40dad
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
...
am: 7b445d59ef
2017-07-27 01:20:05 +00:00
Matthew Fritze
68617a6f42
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
...
am: c2cb0d0b9e
2017-07-27 01:20:02 +00:00
Bill Yi
1602913a75
Import translations. DO NOT MERGE am: 05185952c8 -s ours am: 64ce525c6a -s ours
...
am: b0126e3500
2017-07-27 01:10:19 +00:00
Matthew Fritze
9092e1a0b0
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
...
am: c2cb0d0b9e
2017-07-27 01:09:55 +00:00
jackqdyulei
75e89dfede
Merge "Set minLines for battery header text" into oc-dr1-dev
...
am: 02560caa92
2017-07-27 01:08:43 +00:00
Andrew Sapperstein
7b445d59ef
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
2017-07-27 01:01:26 +00:00
Bill Yi
b0126e3500
Import translations. DO NOT MERGE am: 05185952c8 -s ours
...
am: 64ce525c6a
2017-07-27 00:55:57 +00:00
Bill Yi
e3e1e7b9d4
Import translations. DO NOT MERGE am: 05185952c8 -s ours
...
am: 64ce525c6a
2017-07-27 00:55:32 +00:00
jackqdyulei
aa5618fd82
Add ResultPayload for Allow notification dots
...
Bug: 62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
2017-07-26 17:55:11 -07:00
TreeHugger Robot
8e13218ec8
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
2017-07-27 00:50:10 +00:00
Andrew Sapperstein
b3cf0a0923
Fix more config_headlineFontFamily-induced test breakages
...
Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes: 64024743
Test: robotests
2017-07-26 17:41:48 -07:00
TreeHugger Robot
c2cb0d0b9e
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
2017-07-27 00:31:13 +00:00
jackqdyulei
063e87c689
Merge "Set minLines for battery header text" into oc-dr1-dev
...
am: 02560caa92
2017-07-27 00:05:53 +00:00
TreeHugger Robot
02560caa92
Merge "Set minLines for battery header text" into oc-dr1-dev
2017-07-26 23:46:42 +00:00
TreeHugger Robot
5d7fab4f22
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
2017-07-26 23:34:22 +00:00
Bill Yi
64ce525c6a
Import translations. DO NOT MERGE
...
am: 05185952c8
2017-07-26 23:22:33 +00:00
Ajay Nadathur
353fb3424b
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am: f5ebc6f7ed am: 044485b850
...
am: 06a9a033a0
2017-07-26 22:53:34 +00:00
