OSDN Git Service
Jian Zhou [Thu, 27 Jul 2017 18:29:03 +0000 (18:29 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0 am:
86535a3d15
am:
62bb1e75ac
Change-Id: I9dc6da68107514e839b4284a4aeab47f43f745e6
Ryusuke Sawa [Thu, 27 Jul 2017 18:28:17 +0000 (18:28 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a am:
b0e008841f am:
6b46a9df49
am:
775c1c8eb5
Change-Id: Ib66a063ebbee94370f69be336d82706da39be427
Jian Zhou [Thu, 27 Jul 2017 18:26:35 +0000 (18:26 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb am:
3aee5e1ad0
am:
86535a3d15
Change-Id: Ia6f34a3cf6e9b64669ca494c5088791ae5021092
jackqdyulei [Thu, 27 Jul 2017 18:26:24 +0000 (18:26 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev am:
4ab4966e7a
am:
16afa828c7
Change-Id: I16bcd80c82ed42f65b1490f1f8189e5e55844688
Ryusuke Sawa [Thu, 27 Jul 2017 18:26:18 +0000 (18:26 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a am:
b0e008841f
am:
6b46a9df49
Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469
Jian Zhou [Thu, 27 Jul 2017 18:24:10 +0000 (18:24 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues" am:
41b4d908bb
am:
3aee5e1ad0
Change-Id: I2b3686a91254fd6f0a1050cf8be68304a70a03f5
Ryusuke Sawa [Thu, 27 Jul 2017 18:23:51 +0000 (18:23 +0000)]
Merge "Show Error dialog when WPS is interrupted" am:
fd7dec5d4a
am:
b0e008841f
Change-Id: I31f65d59a105db0fc49e73c4e3d7005d0102906d
Jian Zhou [Thu, 27 Jul 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
am:
41b4d908bb
Change-Id: If3c634811506bdc9f3de5501e60f6a662ac2873a
Ryusuke Sawa [Thu, 27 Jul 2017 18:21:19 +0000 (18:21 +0000)]
Merge "Show Error dialog when WPS is interrupted"
am:
fd7dec5d4a
Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
jackqdyulei [Thu, 27 Jul 2017 18:21:16 +0000 (18:21 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev
am:
4ab4966e7a
Change-Id: I323a94bc867d7575bd7ec7e34c506dd8e78ec2d1
Treehugger Robot [Thu, 27 Jul 2017 18:16:08 +0000 (18:16 +0000)]
Merge "Settings: Fix SparseArray null pointer issue in monkey issues"
TreeHugger Robot [Thu, 27 Jul 2017 18:15:55 +0000 (18:15 +0000)]
Merge "Don't update the header when toggle menu" into oc-dr1-dev
Treehugger Robot [Thu, 27 Jul 2017 18:15:35 +0000 (18:15 +0000)]
Merge "Show Error dialog when WPS is interrupted"
Android Build Merger (Role) [Thu, 27 Jul 2017 17:57:20 +0000 (17:57 +0000)]
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0 am:
6f0e9273f8" into oc-mr1-dev-plus-aosp
Soroosh Mariooryad [Thu, 27 Jul 2017 17:57:04 +0000 (17:57 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0
am:
6f0e9273f8
Change-Id: I567e41b2754bbf2af7295ce3443cb0be2aa90411
Android Build Merger (Role) [Thu, 27 Jul 2017 17:57:03 +0000 (17:57 +0000)]
Merge "Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0 am:
e993ab19fc" into oc-mr1-dev-plus-aosp
jackqdyulei [Thu, 27 Jul 2017 17:56:44 +0000 (17:56 +0000)]
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
am:
ea7c30265c
Change-Id: Ice74f01d0e7a4e5675383a5abe89d0b3ccab4de7
Soroosh Mariooryad [Thu, 27 Jul 2017 17:56:43 +0000 (17:56 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev am:
c3bb4cd8c0
am:
e993ab19fc
Change-Id: I5903157a27f97ac1d8f429978b400d7f22428f28
Soroosh Mariooryad [Thu, 27 Jul 2017 17:54:48 +0000 (17:54 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am:
c3bb4cd8c0
Change-Id: Ia59839d3b952420390896d06c030905853df92e7
Soroosh Mariooryad [Thu, 27 Jul 2017 17:54:46 +0000 (17:54 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
am:
c3bb4cd8c0
Change-Id: Iad0b750eaaee29a41be6514cc29d521bc899b71a
TreeHugger Robot [Thu, 27 Jul 2017 17:53:54 +0000 (17:53 +0000)]
Merge "Add ResultPayload for Allow notification dots" into oc-mr1-dev
Soroosh Mariooryad [Thu, 27 Jul 2017 17:39:04 +0000 (17:39 +0000)]
Merge "Update suggestion ranking model coefficients." into oc-dr1-dev
Android Build Merger (Role) [Thu, 27 Jul 2017 12:46:13 +0000 (12:46 +0000)]
Merge "Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5 am:
698ce72bc2" into oc-mr1-dev-plus-aosp
Julia Reynolds [Thu, 27 Jul 2017 12:45:52 +0000 (12:45 +0000)]
Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5
am:
698ce72bc2
Change-Id: I25c8649c4dbe40ccc721332b08f4a9b65332c0fd
Julia Reynolds [Thu, 27 Jul 2017 12:45:50 +0000 (12:45 +0000)]
Merge "Revert string change" into oc-dr1-dev am:
4b8f2c9ad5
am:
d6ab7dee09
Change-Id: Ic8517b370329586cad908283d94928f1b8c3c308
Julia Reynolds [Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)]
Merge "Revert string change" into oc-dr1-dev
am:
4b8f2c9ad5
Change-Id: I0dbd3d1d3efd494ef592ee1fca201bedbcea881a
Julia Reynolds [Thu, 27 Jul 2017 12:43:21 +0000 (12:43 +0000)]
Merge "Revert string change" into oc-dr1-dev
am:
4b8f2c9ad5
Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6
TreeHugger Robot [Thu, 27 Jul 2017 12:36:55 +0000 (12:36 +0000)]
Merge "Revert string change" into oc-dr1-dev
Soroosh Mariooryad [Thu, 27 Jul 2017 00:51:19 +0000 (17:51 -0700)]
Update suggestion ranking model coefficients.
- This is not a functional change and it only updates the model weights
which affects the ranking of suggestion items. The previous weights were
tuned to force the ranking to have immediate response to signal changes.
But, the current weights are tuned to maximize the user interactions
with suggestion.
Test: RunSettingsRoboTests & also manually testing suggestions
Bug:
64093782
Change-Id: I9f50ed6c4ed22d1a14110ec61156c14ba74aef64
Android Build Merger (Role) [Thu, 27 Jul 2017 05:44:43 +0000 (05:44 +0000)]
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
Andrew Sapperstein [Thu, 27 Jul 2017 05:44:26 +0000 (05:44 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d -s ours
am:
97ca7e473a -s ours
Change-Id: I083ead6fff77b2b319d6c13b9ff95d2679149c2b
Andrew Sapperstein [Thu, 27 Jul 2017 05:44:25 +0000 (05:44 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev am:
3bd56d970d
am:
3b30cbee7d -s ours
Change-Id: I979838abf7aa8a6b5e69bda495ca08edd6110f0d
Andrew Sapperstein [Thu, 27 Jul 2017 05:41:58 +0000 (05:41 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am:
3bd56d970d
Change-Id: I339952e598c48b1fedd0ecdaa05db164484d94cf
Andrew Sapperstein [Thu, 27 Jul 2017 05:41:56 +0000 (05:41 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
am:
3bd56d970d -s ours
Change-Id: If5bdc4ddce79552eb06001f29afb550cc48ebd83
TreeHugger Robot [Thu, 27 Jul 2017 05:37:49 +0000 (05:37 +0000)]
Merge "Add ambient notifications as inline setting." into oc-dr1-dev
Bill Yi [Thu, 27 Jul 2017 02:15:58 +0000 (02:15 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
e3e1e7b9d4 -s ours
am:
a9fc19e385 -s ours
Change-Id: Iaaa737d1fad0e56d13799452af97cd91c8266c94
Andrew Sapperstein [Thu, 27 Jul 2017 02:15:36 +0000 (02:15 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am:
7b445d59ef
am:
fe35c40dad
Change-Id: I018aa267ca72d8b8c42fa6e0e39c5cc454fb4d20
Bill Yi [Thu, 27 Jul 2017 02:15:13 +0000 (02:15 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
b0126e3500 -s ours
am:
1602913a75 -s ours
Change-Id: Iad694020c5ab0c0e4105940da1cc1a0b3854c435
Matthew Fritze [Thu, 27 Jul 2017 02:14:54 +0000 (02:14 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am:
c2cb0d0b9e
am:
9092e1a0b0
Change-Id: I44bc5c7f3576eeba51913a8a852b6ecfc5f5fbd5
jackqdyulei [Thu, 27 Jul 2017 02:14:28 +0000 (02:14 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev am:
02560caa92
am:
75e89dfede
Change-Id: I718c78a47392273db4cff54abe6a2f80067f4d7e
Ryusuke Sawa [Fri, 19 Jul 2013 05:32:19 +0000 (14:32 +0900)]
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
Andrew Sapperstein [Thu, 27 Jul 2017 01:36:57 +0000 (01:36 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev am:
7b445d59ef
am:
1ee62c16a3
Change-Id: I7f051180f0938d3eb467e87c522fc9fb4b12e5f5
Bill Yi [Thu, 27 Jul 2017 01:36:32 +0000 (01:36 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours am:
b0126e3500 -s ours
am:
ef36ef28d9 -s ours
Change-Id: Iec10999409679807df916e04ca9413385c33093f
Matthew Fritze [Thu, 27 Jul 2017 01:35:04 +0000 (01:35 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev am:
c2cb0d0b9e
am:
68617a6f42
Change-Id: Ibe30aace8256cc25a1856f90877ea57a73f60419
Doris Ling [Thu, 27 Jul 2017 01:33:52 +0000 (01:33 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
am:
8e13218ec8
Change-Id: Ie0b5b306e00e6bb62e5385caabdf306c98fb8c05
jackqdyulei [Thu, 27 Jul 2017 01:33:28 +0000 (01:33 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev am:
02560caa92
am:
063e87c689
Change-Id: I641556b2baa47690a616dc0e4fec91070a8e4565
Andrew Sapperstein [Thu, 27 Jul 2017 01:32:37 +0000 (01:32 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
am:
5d7fab4f22
Change-Id: I2654f7820dda35f45b3c4fe1f4792e68736b00ef
Bill Yi [Thu, 27 Jul 2017 01:24:51 +0000 (01:24 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
e3e1e7b9d4 -s ours
Change-Id: I851c408375fa08799cc3be2330e18a928abd89e3
Andrew Sapperstein [Thu, 27 Jul 2017 01:21:05 +0000 (01:21 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am:
7b445d59ef
Change-Id: Ibe7f73e37c446d908e8b69b2a3789c7b22f34509
Bill Yi [Thu, 27 Jul 2017 01:20:25 +0000 (01:20 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
b0126e3500 -s ours
Change-Id: Id66f31e0cb7118122723aa5f7ac87837d8075e8a
Andrew Sapperstein [Thu, 27 Jul 2017 01:20:05 +0000 (01:20 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
am:
7b445d59ef
Change-Id: I44d837dd039a13ef7f2bf236657a5fae3640b0be
Matthew Fritze [Thu, 27 Jul 2017 01:20:02 +0000 (01:20 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am:
c2cb0d0b9e
Change-Id: I0c11d28b60492723f985c606253a0a9dc6c07595
Bill Yi [Thu, 27 Jul 2017 01:10:19 +0000 (01:10 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours am:
64ce525c6a -s ours
am:
b0126e3500 -s ours
Change-Id: Ie1a52928c7d6a8f8da3444e74249da90a62d7b00
Matthew Fritze [Thu, 27 Jul 2017 01:09:55 +0000 (01:09 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
am:
c2cb0d0b9e
Change-Id: I701fb6fc2d74fef1fce1f4b0d21c86d79012b76d
jackqdyulei [Thu, 27 Jul 2017 01:08:43 +0000 (01:08 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am:
02560caa92
Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e
Andrew Sapperstein [Thu, 27 Jul 2017 01:01:26 +0000 (01:01 +0000)]
Merge "Fix more config_headlineFontFamily-induced test breakages" into oc-dr1-dev
Bill Yi [Thu, 27 Jul 2017 00:55:57 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours
am:
64ce525c6a -s ours
Change-Id: Idfd7931360bf1ac57a9bc7937ceb36ade0839963
Bill Yi [Thu, 27 Jul 2017 00:55:32 +0000 (00:55 +0000)]
Import translations. DO NOT MERGE am:
05185952c8 -s ours
am:
64ce525c6a -s ours
Change-Id: Ided1154cb4002792a68ddfed98dd057d7f88e620
jackqdyulei [Tue, 25 Jul 2017 01:34:33 +0000 (18:34 -0700)]
Add ResultPayload for Allow notification dots
Bug:
62022517
Test: robotests
Change-Id: I86caa1c8604ae8eff27574ca45b5e9f3f6830f8f
TreeHugger Robot [Thu, 27 Jul 2017 00:50:10 +0000 (00:50 +0000)]
Merge "Fix gestures summary text when there is no sensor for assit." into oc-mr1-dev
Andrew Sapperstein [Thu, 27 Jul 2017 00:41:48 +0000 (17:41 -0700)]
Fix more config_headlineFontFamily-induced test breakages
Change-Id: Ic8a68a77e7ef8a3fd422e53e39d2fee74324c355
Fixes:
64024743
Test: robotests
TreeHugger Robot [Thu, 27 Jul 2017 00:31:13 +0000 (00:31 +0000)]
Merge "Change SwipeForNotification Payload default to Off" into oc-dr1-dev
jackqdyulei [Thu, 27 Jul 2017 00:05:53 +0000 (00:05 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
am:
02560caa92
Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142
TreeHugger Robot [Wed, 26 Jul 2017 23:46:42 +0000 (23:46 +0000)]
Merge "Set minLines for battery header text" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 23:34:22 +0000 (23:34 +0000)]
Merge "Add ambient notifications as inline setting." into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 23:22:33 +0000 (23:22 +0000)]
Import translations. DO NOT MERGE
am:
05185952c8 -s ours
Change-Id: I2fcf9dbc20ad0600ac924d106e5a87d49752f379
jackqdyulei [Wed, 26 Jul 2017 20:50:43 +0000 (13:50 -0700)]
Don't update the header when toggle menu
If we only toggle the app type in battery settings, don't update
the header. Then it won't have flicker in battery header.
Bug:
64065456
Test: RunSettingsRoboTest
Change-Id: If1cfa745f723f808ad9c5fd921be797acd3199ba
Ajay Nadathur [Wed, 26 Jul 2017 22:26:27 +0000 (22:26 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am:
f5ebc6f7ed
am:
044485b850
Change-Id: Ifae5025374a37d1bf8cc07a8af013bff9267f8d5
Ajay Nadathur [Wed, 26 Jul 2017 22:16:46 +0000 (22:16 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev am:
f5ebc6f7ed
am:
3c308aef22
Change-Id: Idc7a3f732ca5977ad14dfb9e05db3d80898dc822
Ajay Nadathur [Wed, 26 Jul 2017 22:02:33 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am:
f5ebc6f7ed
Change-Id: Ia91197e1d6ee74fd890887330da1eaeb932cd5cb
Ajay Nadathur [Wed, 26 Jul 2017 22:02:05 +0000 (22:02 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
am:
f5ebc6f7ed
Change-Id: I106b98a55eec646959a4f00c44074efc9f0dbe39
Ajay Nadathur [Wed, 26 Jul 2017 21:42:12 +0000 (21:42 +0000)]
Merge "Use fingerprint icons during setupwizard flow" into oc-dr1-dev
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.
Bug:
62022517
Test: robotest and manual
Change-Id: I7e3faf56a1c8282017a2e84d88e7b0b788a7bfb6
Merged-In: If245f541ec3c8a1627d082b97bba9b325438cfeb
Andrew Sapperstein [Wed, 26 Jul 2017 18:55:31 +0000 (11:55 -0700)]
Add ambient notifications as inline setting.
Bug:
62022517
Test: robotest and manual
Change-Id: If245f541ec3c8a1627d082b97bba9b325438cfeb
Matthew Fritze [Wed, 26 Jul 2017 19:59:50 +0000 (12:59 -0700)]
Change SwipeForNotification Payload default to Off
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: Icf6b1224e0857841dcb0d9dd14948d9ef39110ee
Bill Yi [Wed, 26 Jul 2017 19:47:51 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
975d9a18f1 -s ours
Change-Id: Id7b12d9714304d13c6b0fa60a4a3b2eec9b4c160
TreeHugger Robot [Wed, 26 Jul 2017 19:39:46 +0000 (19:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
jackqdyulei [Wed, 26 Jul 2017 18:24:54 +0000 (11:24 -0700)]
Set minLines for battery header text
So the header won't grow/shrink when the text changes.
Bug:
64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
Doris Ling [Wed, 26 Jul 2017 18:07:19 +0000 (11:07 -0700)]
Fix gestures summary text when there is no sensor for assit.
Should exit the summary handling if sensor is not available.
Change-Id: I5918fa5ac614db48fc2c41e1de555d1ba6928bd4
Fix:
64039312
Test: make RunSettingsRoboTests
Bill Yi [Wed, 26 Jul 2017 17:48:32 +0000 (17:48 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
402abcc9df -s ours
am:
bd429f42cb -s ours
Change-Id: Ia36706cecaa4a47f7c5963bbd76702b918fcf51d
Bill Yi [Wed, 26 Jul 2017 17:27:31 +0000 (10:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8f49a9c6acaa689f9269aaca9f22e8b4ab4a5ae0
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:26:06 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
402abcc9df -s ours
am:
eca6781a49 -s ours
Change-Id: I76deaa778d926e596a7da86e660c6356a1c4f704
Antony Sargent [Wed, 26 Jul 2017 17:09:14 +0000 (17:09 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am:
9fb7a3b8b4
am:
1e69f27a41
Change-Id: Iaf5a8c94d8efc7ca22b242f725a9fd94145a163b
Bill Yi [Wed, 26 Jul 2017 17:04:23 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
402abcc9df -s ours
Change-Id: I8b980099381db8f56e3a339dfe497cce93595674
Bill Yi [Wed, 26 Jul 2017 16:46:51 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
402abcc9df -s ours
Change-Id: Ib6905c29f41aaea8c779f1771793da0daa2326dd
TreeHugger Robot [Wed, 26 Jul 2017 16:31:13 +0000 (16:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Antony Sargent [Wed, 26 Jul 2017 16:19:02 +0000 (16:19 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev am:
9fb7a3b8b4
am:
c3cd88c302
Change-Id: Ibeca8eb7fd61b0a730dc4c77a80a152d69eba0ca
Antony Sargent [Wed, 26 Jul 2017 16:18:50 +0000 (16:18 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am:
9fb7a3b8b4
Change-Id: Ic44e0cf3972085439a603e25374d46447ebe7a8f
Bill Yi [Wed, 26 Jul 2017 15:07:49 +0000 (08:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:32:24 +0000 (07:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Antony Sargent [Wed, 26 Jul 2017 11:12:39 +0000 (11:12 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
am:
9fb7a3b8b4
Change-Id: I63ea14bf12934edfe259ab04beae4653082fbf25
TreeHugger Robot [Wed, 26 Jul 2017 10:53:30 +0000 (10:53 +0000)]
Merge "Allow open password dialog for wrong-password wifi access points" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 08:46:06 +0000 (08:46 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours am:
0c3ee7c15d -s ours
am:
565664fad7 -s ours
Change-Id: I58da132af7b082860813238be8b054955629cbc9
Bill Yi [Wed, 26 Jul 2017 08:24:19 +0000 (08:24 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
0c3ee7c15d -s ours
Change-Id: Id2a54f2d8f8dd4a0558b95bf70f9ccd36c8d70b5
Android Build Merger (Role) [Wed, 26 Jul 2017 08:06:55 +0000 (08:06 +0000)]
Merge "Import translations. DO NOT MERGE am:
8a25fb603a -s ours am:
9d7971905c -s ours am:
9d33ddc3f7 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:06:37 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours am:
9d7971905c -s ours
am:
9d33ddc3f7 -s ours
Change-Id: I8fb617839c8e4e691ac823301c006b2636eb0957
Bill Yi [Wed, 26 Jul 2017 08:06:35 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours am:
9d7971905c -s ours
am:
a2954b3232 -s ours
Change-Id: Id6eb63a599efb450f30d5dddc0973c1936daf6df
Bill Yi [Wed, 26 Jul 2017 08:06:13 +0000 (08:06 +0000)]
Import translations. DO NOT MERGE
am:
8a25fb603a -s ours
Change-Id: Ic9ca03e989bf73561c4884cf168a33f64c02973f
Bill Yi [Wed, 26 Jul 2017 08:03:07 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
9d7971905c -s ours
Change-Id: I689d34a1c300988ae315959a6d4fbb48158cffbf
Bill Yi [Wed, 26 Jul 2017 08:03:05 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE am:
8a25fb603a -s ours
am:
9d7971905c -s ours
Change-Id: I7f2e3e064028eb5634b3896ea24cee481d6e3c88
OSDN Git Service
