OSDN Git Service
Richard Coles [Thu, 27 Jul 2017 14:58:04 +0000 (14:58 +0000)]
Merge "Improve ActivityManagerInternal.startIsolatedProcess."
Beverly [Thu, 27 Jul 2017 14:52:14 +0000 (14:52 +0000)]
Merge "Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7 am:
856b8b9e32" into oc-mr1-dev-plus-aosp
am:
81dbde4840
Change-Id: Icd9237ae05e2a169b536384d9097c637c759325a
Beverly [Thu, 27 Jul 2017 14:50:13 +0000 (14:50 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7 am:
4f36d642a4
am:
cac46d0fff
Change-Id: Ic95879fb67ddfece866c5bb57a9f5f4b26af1d02
Android Build Merger (Role) [Thu, 27 Jul 2017 14:45:29 +0000 (14:45 +0000)]
Merge "Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7 am:
856b8b9e32" into oc-mr1-dev-plus-aosp
Beverly [Thu, 27 Jul 2017 14:43:37 +0000 (14:43 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7
am:
856b8b9e32
Change-Id: Idd9d5abf5741b7bc040fbe2817e6cf465cff7386
Beverly [Thu, 27 Jul 2017 14:43:36 +0000 (14:43 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev am:
6526347aa7
am:
4f36d642a4
Change-Id: Id56843030e465e8df76ac3c0da7e67e7aa55fa2a
TreeHugger Robot [Thu, 27 Jul 2017 14:42:13 +0000 (14:42 +0000)]
Merge "Fix Skia pipeline readback for non-portrait mode (part 2)"
Beverly [Thu, 27 Jul 2017 14:36:14 +0000 (14:36 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev
am:
6526347aa7
Change-Id: I73e9b39cd3e8e1be818ff85431e6a22085c8b0e8
Beverly [Thu, 27 Jul 2017 14:36:12 +0000 (14:36 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev
am:
6526347aa7
Change-Id: I747c3fba988fe1ed159f4b231a641c32de30a11e
Julia Reynolds [Thu, 27 Jul 2017 14:36:11 +0000 (14:36 +0000)]
Merge "Differentiate dnd countdowns/countdowns to an alarm" into oc-mr1-dev am:
a33b64cea0
am:
35b402dfc2
Change-Id: I91979733613767c59170caf295daef7172593f73
Julia Reynolds [Thu, 27 Jul 2017 14:29:17 +0000 (14:29 +0000)]
Merge "Differentiate dnd countdowns/countdowns to an alarm" into oc-mr1-dev
am:
a33b64cea0
Change-Id: Ie60c1cacfc50eb20049569656790ef27367a3c9f
TreeHugger Robot [Thu, 27 Jul 2017 14:27:25 +0000 (14:27 +0000)]
Merge "Check if stream exists on volume changed." into oc-dr1-dev
TreeHugger Robot [Thu, 27 Jul 2017 14:23:03 +0000 (14:23 +0000)]
Merge "Differentiate dnd countdowns/countdowns to an alarm" into oc-mr1-dev
Pavel Grafov [Thu, 27 Jul 2017 14:14:09 +0000 (14:14 +0000)]
Merge "Don't attemp to verify synthetic password from adb." into oc-mr1-dev am:
b64fef762c
am:
32fe65cd59
Change-Id: Ia7b4bc59f914d9a5c51c78ccf30e7d43d2bc9876
Pavel Grafov [Thu, 27 Jul 2017 14:08:39 +0000 (14:08 +0000)]
Merge "Don't attemp to verify synthetic password from adb." into oc-mr1-dev
am:
b64fef762c
Change-Id: Ib5b6a0c7b35d9dfb43d97c31eceb7e7b7564b294
Pavel Grafov [Thu, 27 Jul 2017 14:01:39 +0000 (14:01 +0000)]
Merge "Don't attemp to verify synthetic password from adb." into oc-mr1-dev
Neil Fuller [Thu, 27 Jul 2017 14:00:50 +0000 (14:00 +0000)]
Merge "Alter condition for starting RulesManagerService" am:
a338679173 am:
3e928af733 am:
4c1ade06b3 am:
a63d879f4c
am:
1afb2417d7 -s ours
Change-Id: I0a88017820026f5ec01f0fc18f197f1d3611c449
Neil Fuller [Thu, 27 Jul 2017 13:55:17 +0000 (13:55 +0000)]
Merge "Alter condition for starting RulesManagerService" am:
a338679173 am:
3e928af733 am:
4c1ade06b3
am:
a63d879f4c
Change-Id: I84949a5f869d25fd61a5a79b4f0a772582829da5
Neil Fuller [Thu, 27 Jul 2017 13:49:21 +0000 (13:49 +0000)]
Merge "Alter condition for starting RulesManagerService" am:
a338679173 am:
3e928af733
am:
4c1ade06b3
Change-Id: I5e42752fcf6e1bee87db8c78daaa5d6364a15ee5
Neil Fuller [Thu, 27 Jul 2017 13:42:39 +0000 (13:42 +0000)]
Merge "Alter condition for starting RulesManagerService" am:
a338679173
am:
3e928af733
Change-Id: I885b05915d72d284784e1eabe548a9aef048dbc5
Neil Fuller [Thu, 27 Jul 2017 13:35:23 +0000 (13:35 +0000)]
Merge "Alter condition for starting RulesManagerService"
am:
a338679173
Change-Id: I442dd6a30f022f92fb3fd8a0a5cca58d4ec77208
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:35:21 +0000 (13:35 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am:
9b9e823096 am:
7dc29d076f am:
18eb3b4ff1 am:
2b923c07a7
am:
29b8db4340
Change-Id: Ie88f814fe61748b8a9ae0cd2cd651ad9e5239fb1
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:29:44 +0000 (13:29 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am:
9b9e823096 am:
7dc29d076f am:
18eb3b4ff1
am:
2b923c07a7
Change-Id: I7c1abcb43f062a4055b2f65a19b32d18fe5211cb
Treehugger Robot [Thu, 27 Jul 2017 13:25:49 +0000 (13:25 +0000)]
Merge "Alter condition for starting RulesManagerService"
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:24:07 +0000 (13:24 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am:
9b9e823096 am:
7dc29d076f
am:
18eb3b4ff1
Change-Id: Id90d02a05413812df90a3691f1f4b8a99e74669b
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:18:06 +0000 (13:18 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init."" am:
9b9e823096
am:
7dc29d076f
Change-Id: I7044177aa99426810c23e2100633d3f2c85d5c8e
Przemyslaw Szczepaniak [Thu, 27 Jul 2017 13:11:44 +0000 (13:11 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
am:
9b9e823096
Change-Id: I54b658a7911d604af79916f92c8406472e3c9ccb
Sundeep Ghuman [Thu, 27 Jul 2017 13:02:59 +0000 (13:02 +0000)]
Merge "Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am:
6628e48a1f am:
701215725e" into oc-mr1-dev-plus-aosp
am:
1d9cefdf16
Change-Id: I650a06fb1199651f5f5966ebec2fac7abe2dce16
Sundeep Ghuman [Thu, 27 Jul 2017 13:01:09 +0000 (13:01 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am:
6628e48a1f am:
aca575e988
am:
6c3fdb6795
Change-Id: I9d4402c22b13cfa4c0aba3b38e04a37675b48270
Treehugger Robot [Thu, 27 Jul 2017 13:01:05 +0000 (13:01 +0000)]
Merge "Revert "Default 'persist.sys.timezone' property to GMT if not set on init.""
Android Build Merger (Role) [Thu, 27 Jul 2017 12:56:00 +0000 (12:56 +0000)]
Merge "Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am:
6628e48a1f am:
701215725e" into oc-mr1-dev-plus-aosp
Sundeep Ghuman [Thu, 27 Jul 2017 12:54:20 +0000 (12:54 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am:
6628e48a1f
am:
701215725e
Change-Id: I11a48e259985244f1d608b9924c06b1d593b9c3b
Sundeep Ghuman [Thu, 27 Jul 2017 12:54:01 +0000 (12:54 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev am:
6628e48a1f
am:
aca575e988
Change-Id: I755730c24c8837193e01e7b069f3eaa1fb9c55d1
Sundeep Ghuman [Thu, 27 Jul 2017 12:46:37 +0000 (12:46 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev
am:
6628e48a1f
Change-Id: I42646bd34afed594e105ff55217276ead380ece5
Sundeep Ghuman [Thu, 27 Jul 2017 12:46:31 +0000 (12:46 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev
am:
6628e48a1f
Change-Id: I0d3c6b32c40141c6745c2c76c7439834de17fb24
TreeHugger Robot [Thu, 27 Jul 2017 12:40:20 +0000 (12:40 +0000)]
Merge "Do not show unreachable APs in QS Wifi Picker." into oc-dr1-dev
Narayan Kamath [Thu, 27 Jul 2017 12:09:11 +0000 (12:09 +0000)]
Merge "Remove CoreTests: HeapTest" am:
c3fd3b8c7d am:
19d39ee384 am:
1cfc324de1 am:
2d82836601
am:
ad72d319ba
Change-Id: Ic9f783b023b09bd29b392e6aadecc25311499c40
TreeHugger Robot [Thu, 27 Jul 2017 12:06:55 +0000 (12:06 +0000)]
Merge "Alter condition for starting RulesManagerService"
Narayan Kamath [Thu, 27 Jul 2017 12:00:10 +0000 (12:00 +0000)]
Merge "Remove CoreTests: HeapTest" am:
c3fd3b8c7d am:
19d39ee384 am:
1cfc324de1
am:
2d82836601
Change-Id: If9a442d49b90a301fe03e3727944f589d02d811a
Narayan Kamath [Thu, 27 Jul 2017 11:52:36 +0000 (11:52 +0000)]
Merge "Remove CoreTests: HeapTest" am:
c3fd3b8c7d am:
19d39ee384
am:
1cfc324de1
Change-Id: I884488795303effda4274978c93e086cee433272
Narayan Kamath [Thu, 27 Jul 2017 11:45:08 +0000 (11:45 +0000)]
Merge "Remove CoreTests: HeapTest" am:
c3fd3b8c7d
am:
19d39ee384
Change-Id: I7ac73bf032ea640bc65c5c85df75330133255052
Narayan Kamath [Thu, 27 Jul 2017 11:37:02 +0000 (11:37 +0000)]
Merge "Remove CoreTests: HeapTest"
am:
c3fd3b8c7d
Change-Id: If6565f8bc8a655d3d7422f57db3dd6160459b092
Narayan Kamath [Thu, 27 Jul 2017 11:26:10 +0000 (11:26 +0000)]
Merge "Remove CoreTests: HeapTest"
Przemyslaw Szczepaniak [Wed, 26 Jul 2017 12:12:43 +0000 (12:12 +0000)]
Revert "Default 'persist.sys.timezone' property to GMT if not set on init."
Telephony code depends on persist.sys.timezone not being set as a signal
to deduce a timezone from sim card information.
This reverts commit
20e020536ebf999c4acb759960ae6e4bfff6ba67.
Bug:
64056758
Change-Id: I8db204bcffbdb960124b1ae0e02d53b27dd310a4
Martijn Coenen [Thu, 27 Jul 2017 10:26:26 +0000 (10:26 +0000)]
Merge "screencap: always exit with _exit()." into oc-mr1-dev am:
b92375fe9f
am:
bf3dc5ca6a
Change-Id: I3d88c123467f993ced804e5f8cbdd7d420111f4b
Martijn Coenen [Thu, 27 Jul 2017 10:18:51 +0000 (10:18 +0000)]
Merge "screencap: always exit with _exit()." into oc-mr1-dev
am:
b92375fe9f
Change-Id: Iaab6bc269a226ceaaa217e229c8c19646209f25f
TreeHugger Robot [Thu, 27 Jul 2017 10:10:56 +0000 (10:10 +0000)]
Merge "screencap: always exit with _exit()." into oc-mr1-dev
Lucas Dupin [Thu, 27 Jul 2017 05:21:32 +0000 (05:21 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev am:
6462fe4b95 am:
7ef9f224e4
am:
f2764ed4d5
Change-Id: Icec2c9dc4580d35947cf5f1831caa064e6007687
Lucas Dupin [Thu, 27 Jul 2017 05:18:39 +0000 (05:18 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev am:
6462fe4b95 am:
a6ff492941
am:
46539b92ce
Change-Id: I87b157c34e001e2494657fab2cf3325821af1310
Felipe Leme [Thu, 27 Jul 2017 05:10:51 +0000 (05:10 +0000)]
Merge "Move cursor to end of text when autofilling." into oc-mr1-dev am:
de499f469f
am:
453f2a60fa
Change-Id: If94c356c3a814c800285057bff95dac0ebe3e13b
Lucas Dupin [Thu, 27 Jul 2017 05:09:35 +0000 (05:09 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev am:
6462fe4b95
am:
7ef9f224e4
Change-Id: I54b8ac92106008a1caf617da3683371196d54475
Felipe Leme [Thu, 27 Jul 2017 05:03:16 +0000 (05:03 +0000)]
Merge "Added sliding motion / animation to Autofill Save UI." into oc-mr1-dev am:
2790352cd4
am:
be2a20c4d9
Change-Id: I96f393bb33da09a07944f96bab07dd541e3c0c33
Lucas Dupin [Thu, 27 Jul 2017 05:01:31 +0000 (05:01 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev am:
6462fe4b95
am:
a6ff492941
Change-Id: Ia9a373aafa87f11a23a7119c1c46ef2dd306a368
Lucas Dupin [Thu, 27 Jul 2017 04:54:14 +0000 (04:54 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev
am:
6462fe4b95
Change-Id: I26e59cb96c0560334dcb7501d9e13ec38dc8c9ba
Lucas Dupin [Thu, 27 Jul 2017 04:54:13 +0000 (04:54 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev
am:
6462fe4b95
Change-Id: I358d3544ca50d63a1c7ca4cea1bcc00d5e33512c
TreeHugger Robot [Thu, 27 Jul 2017 04:47:22 +0000 (04:47 +0000)]
Merge "Fix window insets on keyguard" into oc-dr1-dev
Felipe Leme [Thu, 27 Jul 2017 04:33:28 +0000 (04:33 +0000)]
Merge "Move cursor to end of text when autofilling." into oc-mr1-dev
am:
de499f469f
Change-Id: Ic1ededd2eb3ba4827d8efcd170a3f20ffb9f6aa3
Hall Liu [Thu, 27 Jul 2017 04:21:51 +0000 (04:21 +0000)]
Merge "Merge "Check TTY status at bringup" into oc-dr1-dev am:
3d1e1cc9db am:
8e5c9a40a9" into oc-mr1-dev-plus-aosp
am:
77a3c1329f
Change-Id: I6d3414d49710510ad24596751274eb0b291b00a0
TreeHugger Robot [Thu, 27 Jul 2017 04:21:31 +0000 (04:21 +0000)]
Merge "Move cursor to end of text when autofilling." into oc-mr1-dev
Hall Liu [Thu, 27 Jul 2017 04:15:49 +0000 (04:15 +0000)]
Merge "Check TTY status at bringup" into oc-dr1-dev am:
3d1e1cc9db am:
4e3dc656bd
am:
2bd5da8956
Change-Id: I03ceb80a97b402984ec690bb3bdfb569d06d72d9
Felipe Leme [Thu, 27 Jul 2017 04:12:27 +0000 (04:12 +0000)]
Merge "Added sliding motion / animation to Autofill Save UI." into oc-mr1-dev
am:
2790352cd4
Change-Id: I9893df3e3d4fe13bdbdda005d03a03f1825a8974
Paul Crowley [Thu, 27 Jul 2017 04:11:12 +0000 (04:11 +0000)]
Merge "Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev am:
f43054df6b am:
414fd70a4e" into oc-mr1-dev-plus-aosp
am:
85263ba025
Change-Id: I63262b9a6189f482e86e8a3226848cf4f2a88c58
Paul Crowley [Thu, 27 Jul 2017 04:08:41 +0000 (04:08 +0000)]
Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev am:
f43054df6b am:
3d5e376c73
am:
e64e304650
Change-Id: I5e67cafd116b0717e32397360ebc63481c3fe75b
TreeHugger Robot [Thu, 27 Jul 2017 04:07:03 +0000 (04:07 +0000)]
Merge "Added sliding motion / animation to Autofill Save UI." into oc-mr1-dev
Selim Cinek [Thu, 27 Jul 2017 04:06:10 +0000 (04:06 +0000)]
Merge "Added haptic feedback for longpressing." into oc-dr1-dev am:
8a3ccb11a0 am:
9f9503191a
am:
d0abca5220
Change-Id: I1d52904d9d74e91808ee4021acaabf2f0cdee295
Selim Cinek [Thu, 27 Jul 2017 04:03:13 +0000 (04:03 +0000)]
Merge "Added haptic feedback for longpressing." into oc-dr1-dev am:
8a3ccb11a0 am:
8093e387e4
am:
6ef4368cae
Change-Id: Iff715e0a4203bf19563b95ac2b8b57f0bb43504d
Selim Cinek [Thu, 27 Jul 2017 03:59:33 +0000 (03:59 +0000)]
Merge "Not reseting the last fullscreenintent time when reinflating" into oc-mr1-dev am:
fa7d4f4c7b
am:
aed8ed7e8b
Change-Id: I39f6c1ce7f404d7bcfac9b786eb02ee83b02a55f
Android Build Merger (Role) [Thu, 27 Jul 2017 03:56:01 +0000 (03:56 +0000)]
Merge "Merge "Check TTY status at bringup" into oc-dr1-dev am:
3d1e1cc9db am:
8e5c9a40a9" into oc-mr1-dev-plus-aosp
Selim Cinek [Thu, 27 Jul 2017 03:55:37 +0000 (03:55 +0000)]
Merge "Improving the haptic notification experience" into oc-mr1-dev am:
00c988a188
am:
198d861794
Change-Id: I74237ee705391c5a570b52cc75718ef2f97572b0
Hall Liu [Thu, 27 Jul 2017 03:53:32 +0000 (03:53 +0000)]
Merge "Check TTY status at bringup" into oc-dr1-dev am:
3d1e1cc9db
am:
8e5c9a40a9
Change-Id: I4aba9a1df2a1cd84bd51f9be0de5be977799778f
Hall Liu [Thu, 27 Jul 2017 03:51:11 +0000 (03:51 +0000)]
Merge "Check TTY status at bringup" into oc-dr1-dev am:
3d1e1cc9db
am:
4e3dc656bd
Change-Id: I2d2048d0f450db5213aa426f95ed7f4c445a37c5
Bill Yi [Thu, 27 Jul 2017 03:51:06 +0000 (03:51 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours am:
81a1d589ba -s ours am:
27735ae948 -s ours" into oc-dr1-dev-plus-aosp am:
946af3821e -s ours" into oc-mr1-dev-plus-aosp
am:
582f4d9af2 -s ours
Change-Id: I95e78650a28be354207ca22d07c59abefd61c801
Bill Yi [Thu, 27 Jul 2017 03:48:26 +0000 (03:48 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours am:
81a1d589ba -s ours am:
ce64f8f63d -s ours" into oc-dr1-dev-plus-aosp am:
1be00337b8 -s ours" into oc-mr1-dev-plus-aosp
am:
2e92154000 -s ours
Change-Id: I4c300ecaeee59dbb5ccbccc9fad88788723518d7
Hall Liu [Thu, 27 Jul 2017 03:44:40 +0000 (03:44 +0000)]
Merge "Check TTY status at bringup" into oc-dr1-dev
am:
3d1e1cc9db
Change-Id: Ica5daaa6c3889c10a1c41d0f9d0ee97e3d1936bf
Hall Liu [Thu, 27 Jul 2017 03:44:27 +0000 (03:44 +0000)]
Merge "Check TTY status at bringup" into oc-dr1-dev
am:
3d1e1cc9db
Change-Id: I48385860a09dd07ef858230f0a73e5e5cb3a8df3
Android Build Merger (Role) [Thu, 27 Jul 2017 03:39:05 +0000 (03:39 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours am:
81a1d589ba -s ours am:
27735ae948 -s ours" into oc-mr1-dev am:
41c3adfb32 -s ours am:
297609bc3d -s ours"
Bill Yi [Thu, 27 Jul 2017 03:36:55 +0000 (03:36 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours am:
603a43e5c3 -s ours am:
81a1d589ba -s ours am:
27735ae948 -s ours" into oc-mr1-dev am:
41c3adfb32 -s ours
am:
297609bc3d -s ours
Change-Id: I348cec1118d38030222ee94aa1f863c43a59f9ba
Android Build Merger (Role) [Thu, 27 Jul 2017 03:35:51 +0000 (03:35 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours am:
e2f2fbaea1 -s ours am:
6df138613e -s ours" into oc-mr1-dev am:
0f3e1194b1 -s ours am:
2f0c13a653 -s ours"
TreeHugger Robot [Thu, 27 Jul 2017 03:35:35 +0000 (03:35 +0000)]
Merge "Check TTY status at bringup" into oc-dr1-dev
Bill Yi [Thu, 27 Jul 2017 03:31:50 +0000 (03:31 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours am:
e2f2fbaea1 -s ours am:
6df138613e -s ours" into oc-mr1-dev am:
0f3e1194b1 -s ours
am:
2f0c13a653 -s ours
Change-Id: Ib1e534c6d5ec822f1ec4bbce87e89543107d0f67
Android Build Merger (Role) [Thu, 27 Jul 2017 03:31:17 +0000 (03:31 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours am:
0ceb3853e8 -s ours am:
fdcb482a98 -s ours" into oc-mr1-dev am:
80916798b1 -s ours am:
32b2b6ffac -s ours"
Bill Yi [Thu, 27 Jul 2017 03:26:47 +0000 (03:26 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours am:
0ceb3853e8 -s ours am:
fdcb482a98 -s ours" into oc-mr1-dev am:
80916798b1 -s ours
am:
32b2b6ffac -s ours
Change-Id: I8ffc97495d742212ebc025a1ac74d6ca6e0bb32c
Android Build Merger (Role) [Thu, 27 Jul 2017 03:25:38 +0000 (03:25 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours am:
e2f2fbaea1 -s ours am:
6df138613e -s ours am:
573cabcef9 -s ours am:
5391b4ccb1 -s ours"
Android Build Merger (Role) [Thu, 27 Jul 2017 03:25:05 +0000 (03:25 +0000)]
Merge "Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev am:
f43054df6b am:
414fd70a4e" into oc-mr1-dev-plus-aosp
TreeHugger Robot [Thu, 27 Jul 2017 03:24:35 +0000 (03:24 +0000)]
Merge "Make ellipsize retry if text doesn't fit"
Bill Yi [Thu, 27 Jul 2017 03:23:13 +0000 (03:23 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours am:
e2f2fbaea1 -s ours am:
6df138613e -s ours am:
573cabcef9 -s ours
am:
5391b4ccb1 -s ours
Change-Id: I53fa0c2b229ac3e2a42762a94c65a8a0f089a2b6
Android Build Merger (Role) [Thu, 27 Jul 2017 03:22:47 +0000 (03:22 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours am:
0ceb3853e8 -s ours am:
fdcb482a98 -s ours am:
6604d33718 -s ours am:
685f274196 -s ours"
Paul Crowley [Thu, 27 Jul 2017 03:20:23 +0000 (03:20 +0000)]
Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev am:
f43054df6b
am:
414fd70a4e
Change-Id: I09104f39c9837aed73954cf5fe84ed070d05fb63
Bill Yi [Thu, 27 Jul 2017 03:20:15 +0000 (03:20 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours am:
8080362358 -s ours am:
0ceb3853e8 -s ours am:
fdcb482a98 -s ours am:
6604d33718 -s ours
am:
685f274196 -s ours
Change-Id: I61534ca9c90535fcfa6c211849fde427c6b68577
Paul Crowley [Thu, 27 Jul 2017 03:20:07 +0000 (03:20 +0000)]
Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev am:
f43054df6b
am:
3d5e376c73
Change-Id: Iebecb9e52403a5ac45cfa00c30764307d4e9e0da
Android Build Merger (Role) [Thu, 27 Jul 2017 03:19:51 +0000 (03:19 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours am:
995029b529 -s ours am:
1e8ed22be2 -s ours am:
9b16c7b2bb -s ours" into oc-mr1-dev-plus-aosp am:
c015001f98 -s ours"
TreeHugger Robot [Thu, 27 Jul 2017 03:16:57 +0000 (03:16 +0000)]
Merge "Fixed AccountManagerServiceTest"
Bill Yi [Thu, 27 Jul 2017 03:16:38 +0000 (03:16 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
3875d1a103 -s ours am:
995029b529 -s ours am:
1e8ed22be2 -s ours am:
9b16c7b2bb -s ours" into oc-mr1-dev-plus-aosp
am:
c015001f98 -s ours
Change-Id: I4acc5b60ba716f7f57e74f1744a4bb138dc6d073
Android Build Merger (Role) [Thu, 27 Jul 2017 03:15:57 +0000 (03:15 +0000)]
Merge "Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours am:
aec51f497c -s ours am:
b57520aae6 -s ours" into oc-dr1-dev-plus-aosp am:
0b190bd9cb -s ours" into oc-mr1-dev-plus-aosp am:
28099da986 -s ours"
Bill Yi [Thu, 27 Jul 2017 03:12:58 +0000 (03:12 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
c2b08ca602 -s ours am:
aec51f497c -s ours am:
b57520aae6 -s ours" into oc-dr1-dev-plus-aosp am:
0b190bd9cb -s ours" into oc-mr1-dev-plus-aosp
am:
28099da986 -s ours
Change-Id: I27508a52581e240457e03344133086d2238da5ec
Android Build Merger (Role) [Thu, 27 Jul 2017 03:11:36 +0000 (03:11 +0000)]
Merge "Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours am:
e2f2fbaea1 -s ours am:
f417f591a1 -s ours" into oc-dr1-dev-plus-aosp am:
b99a5acab9 -s ours" into oc-mr1-dev-plus-aosp am:
972d146ca7 -s ours"
Sundeep Ghuman [Tue, 18 Jul 2017 22:16:01 +0000 (15:16 -0700)]
Do not show unreachable APs in QS Wifi Picker.
This consolidates logic between the QS Picker and the WifiSettings
Picker. Previous QS behavior would show the out of range networks with
empty wifi pies, can last up to 3 scans, and differs from behavior in
WifiSettings.
Bug: b/
62680006
Test: 1. Open the quick settings picker
2. Minimize the picker
3. Walk out of range of the networks you say listed in the picker
4. Re-open picker
5. Networks should not be shown.
Change-Id: Ic042f3e6ac41b426c343ccca288b26dcaaafa7fb
(cherry picked from commit
bcebe09c9f627b948e0ebc1024ec828b0606ea86)
Bill Yi [Thu, 27 Jul 2017 03:07:56 +0000 (03:07 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours am:
9cf9d294ef -s ours am:
e2f2fbaea1 -s ours am:
f417f591a1 -s ours" into oc-dr1-dev-plus-aosp am:
b99a5acab9 -s ours" into oc-mr1-dev-plus-aosp
am:
972d146ca7 -s ours
Change-Id: I6428a1b0694c86f66087dbac450eb5325337369d
TreeHugger Robot [Thu, 27 Jul 2017 03:07:40 +0000 (03:07 +0000)]
Merge "AssetManager2: Fix a memory leak"
Paul Crowley [Thu, 27 Jul 2017 03:07:02 +0000 (03:07 +0000)]
Merge "Signal init when user 0 CE storage is unlocked" into oc-dr1-dev
am:
f43054df6b
Change-Id: Idaea177d45a70135f3a3e258e413c6d3032190d6
OSDN Git Service
