Hall Liu
c336947da4
Merge "Check success before registering DeathRecipient"
...
am: b6c4bc311a
2017-10-20 23:22:13 +00:00
Hall Liu
b6c4bc311a
Merge "Check success before registering DeathRecipient"
2017-10-20 23:10:09 +00:00
Ben Schwartz
8138b8b3ed
Merge "Remove @Presubmit from SettingsBackupTest.Java"
...
am: 3c48bd72aa
2017-10-20 20:25:37 +00:00
Treehugger Robot
3c48bd72aa
Merge "Remove @Presubmit from SettingsBackupTest.Java"
2017-10-20 20:14:43 +00:00
Ben Schwartz
165a176677
Remove @Presubmit from SettingsBackupTest.Java
...
It appears to be causing problems on some build bots.
Test: Problem can only be reproduced after merge...
Change-Id: I7c9c1c7a54f0e2981faecbf9793eef888f5c97d1
2017-10-20 13:14:20 -07:00
Jack Yu
befb4f2ed4
Merge "Refactored area update info support"
...
am: b1092bfd55
2017-10-20 19:30:02 +00:00
Treehugger Robot
b1092bfd55
Merge "Refactored area update info support"
2017-10-20 19:19:09 +00:00
Dan Willemsen
3130b4e146
Merge "Add link_type for temp_layoutlib"
...
am: d0b0e8cc86
2017-10-20 18:27:58 +00:00
Dan Willemsen
d0b0e8cc86
Merge "Add link_type for temp_layoutlib"
2017-10-20 18:14:56 +00:00
TreeHugger Robot
f9cf2df461
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 16:00:01 +00:00
TreeHugger Robot
5d9bd82bd8
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:39:37 +00:00
TreeHugger Robot
65fb1c889a
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:37:34 +00:00
TreeHugger Robot
e948fe0769
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:36:20 +00:00
TreeHugger Robot
6a83510d9b
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:35:38 +00:00
TreeHugger Robot
c0e7b25f08
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:34:59 +00:00
TreeHugger Robot
9fe4ca37b9
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:33:25 +00:00
TreeHugger Robot
1e829c7f7f
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:32:39 +00:00
TreeHugger Robot
beda9e81f4
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:31:30 +00:00
TreeHugger Robot
3f31cfa6cd
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:31:01 +00:00
TreeHugger Robot
639ee5c778
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:29:19 +00:00
TreeHugger Robot
422b17438b
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:28:04 +00:00
TreeHugger Robot
5fdf106b8b
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:27:19 +00:00
TreeHugger Robot
c035f28175
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2017-10-20 15:23:26 +00:00
Ben Schwartz
3017ebec8c
Merge "Add a global setting to disable DNS over TLS"
...
am: 4a906c167b
2017-10-20 15:08:55 +00:00
Treehugger Robot
4a906c167b
Merge "Add a global setting to disable DNS over TLS"
2017-10-20 14:58:39 +00:00
Nick Kralevich
7c27266544
Merge "more O_CLOEXEC"
...
am: 9f8ed6500a
2017-10-20 14:53:14 +00:00
Treehugger Robot
9f8ed6500a
Merge "more O_CLOEXEC"
2017-10-20 14:44:26 +00:00
Bill Yi
8247691166
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I54b9c45224a393b5724a8964858817e3247ece54
2017-10-20 02:23:10 -07:00
Bill Yi
cf1d728e59
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I1786cdac7dae8737ba1f7ea7665a62dfcfc2d7f2
2017-10-20 02:06:39 -07:00
Niranjan Pendharkar
6d36b2657f
Merge "Fix netlink group mismatch in fds used for offload"
...
am: fb7c0e8c91
2017-10-20 08:25:19 +00:00
Treehugger Robot
fb7c0e8c91
Merge "Fix netlink group mismatch in fds used for offload"
2017-10-20 08:14:40 +00:00
Bill Yi
c33a92328b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I92ebc3587a83fcb69588e4629eac2d8a779c2ebd
2017-10-19 22:58:04 -07:00
Pengquan Meng
c671962c9a
Merge "[framework] Fixed signal strength issue"
...
am: 6d98743048
2017-10-20 05:52:43 +00:00
Dan Willemsen
a2adda41da
Add link_type for temp_layoutlib
...
So that it can be used by java libraries when we turn on dep
verification for host java libraries.
Test: m nothing
Change-Id: Iaa2acfb585db0a67b449e866883f71691395971e
Merged-In: I69a1a826d0bac8ede1f9a337c9c1d930bbcd04f3
2017-10-19 22:50:51 -07:00
Bill Yi
4e2e1486bc
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: Ie775264bf5f54adb9239d9a66821164c8db38136
2017-10-19 22:50:47 -07:00
Pengquan Meng
6d98743048
Merge "[framework] Fixed signal strength issue"
2017-10-20 05:44:42 +00:00
Niranjan Pendharkar
f10282b830
Fix netlink group mismatch in fds used for offload
...
Existing groups used for binding to netlink conntrack events don't
seem to work as expected. Fix this by using exact groups defined
in IOffloadConfig hal.
Test: as follows
- Compiles and boots on walleye
- Validated conntrack destroy events are received as expected.
- Validated offload works as expected.
Bug:68018148
CRs-fixed:2126789
Change-Id: I76178fd7f109b82a4e4961347b8949937813d71d
2017-10-19 22:28:31 -07:00
Steven Moreland
3147d2f429
Merge "HwBinder: don't re-implement libhidl's getService"
...
am: 992f9e7e0b
2017-10-20 04:23:34 +00:00
Bill Yi
93811e9fa0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: If95ea8054ecb9379831d35c7dbc0e66da6eb40cf
2017-10-19 21:12:57 -07:00
Treehugger Robot
992f9e7e0b
Merge "HwBinder: don't re-implement libhidl's getService"
2017-10-20 04:12:29 +00:00
Bill Yi
665e8bb077
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: If7d9f401dbe07259ce36955d9a09eea5d0150bf4
2017-10-19 21:06:15 -07:00
Bill Yi
5509dc4083
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I4b0f45fb1d4416ac0996365e9da9f83b966c6e66
2017-10-19 20:59:22 -07:00
Bill Yi
cdf13713d2
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I3e2f98b1332d9af6f2920163f0ac1e23a660ae5a
2017-10-19 20:52:24 -07:00
Bill Yi
c8afd48544
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: If440fdeb095001858d46bb9fecfe6208200a42f0
2017-10-19 20:44:21 -07:00
Bill Yi
c70053e43b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I787ed0d86b47ab9e642185523d65cb722479fec0
2017-10-19 20:37:47 -07:00
Bill Yi
93bc690c54
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I8a20f1539abd7c79ba8ac37eb6303a43ecdea348
2017-10-19 20:31:20 -07:00
Bill Yi
cada2113f5
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: Ib3f8bff07023825dbc2b4e15daf73e0c03341d29
2017-10-19 20:24:36 -07:00
Bill Yi
ee5257a461
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I5b75f3576500963022b1ff3fa592e0d55a65bcb3
2017-10-19 20:17:42 -07:00
Bill Yi
72eeb9c125
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bug: 68003463
Change-Id: I82a274d2c86925a116b4ef7976246ea0ea4b0a00
2017-10-19 20:10:19 -07:00
Erik Kline
464d7635b0
Merge changes I3b56e75d,I36255a2c
...
am: 5c7128c070
2017-10-20 02:45:14 +00:00
