OSDN Git Service
Di Lu [Thu, 20 Jul 2017 05:57:40 +0000 (05:57 +0000)]
Merge "Add unit test for IpSecManager" am:
dd494fa91c
am:
73b7292a05
Change-Id: I33cb28b9ca07126e4f1b2631604fccf94ae4b530
Di Lu [Thu, 20 Jul 2017 05:52:10 +0000 (05:52 +0000)]
Merge "Add unit test for IpSecManager"
am:
dd494fa91c
Change-Id: I56c336eb8234b31154b6a7defd95ce76ea0800d8
Di Lu [Thu, 20 Jul 2017 05:42:53 +0000 (05:42 +0000)]
Merge "Add unit test for IpSecManager"
Andreas Gampe [Thu, 20 Jul 2017 05:42:34 +0000 (05:42 +0000)]
Merge "Zygote: Poll with timeout for pid" am:
89d119abe6
am:
6078facf1f
Change-Id: I360bf86dbd5ff0c0d3b0fd6bb207692fe1142bd1
Andreas Gampe [Thu, 20 Jul 2017 05:36:42 +0000 (05:36 +0000)]
Merge "Zygote: Poll with timeout for pid"
am:
89d119abe6
Change-Id: I704192c4a2e1d0509f0f3c19b42945f2c00669ed
Treehugger Robot [Thu, 20 Jul 2017 05:25:24 +0000 (05:25 +0000)]
Merge "Zygote: Poll with timeout for pid"
Ahmed ElArabawy [Thu, 20 Jul 2017 03:54:03 +0000 (03:54 +0000)]
Merge "Add Configuration to APF Policy" am:
d27a6d62c6
am:
70291ef1d7
Change-Id: Ib2881c42b6eb149ac4f964d9d8d29ac74a057000
Ahmed ElArabawy [Thu, 20 Jul 2017 03:46:08 +0000 (03:46 +0000)]
Merge "Add Configuration to APF Policy"
am:
d27a6d62c6
Change-Id: I491bad86e4e9ae7a813ac214b06273719a583079
Treehugger Robot [Thu, 20 Jul 2017 03:34:57 +0000 (03:34 +0000)]
Merge "Add Configuration to APF Policy"
Steven Moreland [Thu, 20 Jul 2017 02:58:46 +0000 (02:58 +0000)]
Merge "frameworks/base: use proper nativehelper headers" am:
826eafd958
am:
5c091dc944
Change-Id: I582cc33d13d04950ca066074c292141605f3ca27
Steven Moreland [Thu, 20 Jul 2017 02:50:53 +0000 (02:50 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
am:
826eafd958
Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
Andreas Gampe [Thu, 13 Jul 2017 02:17:52 +0000 (19:17 -0700)]
Zygote: Poll with timeout for pid
Do not use a blocking readInt. Poll for available bytes with a timeout.
(cherry picked from commit
cbc421406193308667a38b0bebc16c4064a19e83)
Bug:
63638768
Test: m
Test: cts-tradefed run commandAndExit cts-dev -m CtsWrapWrapDebugTestCases
Change-Id: Ib2131c00aa47dd10bb940d8678bbbfb5a0346ad5
Treehugger Robot [Thu, 20 Jul 2017 02:42:49 +0000 (02:42 +0000)]
Merge "frameworks/base: use proper nativehelper headers"
Ahmed ElArabawy [Tue, 13 Jun 2017 01:01:11 +0000 (18:01 -0700)]
Add Configuration to APF Policy
in b/
37702435 battery was drained due to reception of
Ethernet frames with Eth-type < 0x600 (non ehternet II frames)
This change adds an XML file to drop/allow these frames
Dropping helps tp avoid acquiring a wakelock for the
reception of these packets, while allowing them may be needed
for some protocols
The Change allow the OEM to override the system settings
Bug:
37702435
Test: runtest frameworks-net
Merged-In: Idb6c215896ef230a8136ff4ecefc90ccdc5c1c6d
Merged-In: I16346bb98a0b9259f7c3f51e318c472cfc1bb492
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
(cherry pick from commit
4dd7c58fc8fcc5a2c50de5e8eff05ddc5c3b0b8b)
Change-Id: Ie466baf1e6395d6c28245e41179232ea8e523845
ludi [Fri, 12 May 2017 16:15:00 +0000 (09:15 -0700)]
Add unit test for IpSecManager
Test: runtest frameworks-net
Bug:
38259578
Change-Id: Idb76aab899ccb7145bef2b7dce36e115c25fa6ca
Robert Greenwalt [Thu, 20 Jul 2017 00:36:53 +0000 (00:36 +0000)]
Merge "Add details to Download progress callback" am:
b440b572d7
am:
5f047a68d9
Change-Id: I5b26730aacb9209f08b33204fb88be02c324609a
Robert Greenwalt [Thu, 20 Jul 2017 00:30:50 +0000 (00:30 +0000)]
Merge "Add details to Download progress callback"
am:
b440b572d7
Change-Id: Idb7ebf8ec5d0b6b341c97dab05efc94e9e629011
Treehugger Robot [Thu, 20 Jul 2017 00:23:48 +0000 (00:23 +0000)]
Merge "Add details to Download progress callback"
Hall Liu [Thu, 20 Jul 2017 00:06:40 +0000 (00:06 +0000)]
Merge "Add timezone for Telecom event date formatting" am:
bf296640e6
am:
5af59940d1
Change-Id: I3030838f38aa9593d57f9d844d0e9553c3b76997
Hall Liu [Wed, 19 Jul 2017 23:58:16 +0000 (23:58 +0000)]
Merge "Add timezone for Telecom event date formatting"
am:
bf296640e6
Change-Id: Ic9db643ff6d204f75aed44160003bbe0b685eb7e
Treehugger Robot [Wed, 19 Jul 2017 23:46:52 +0000 (23:46 +0000)]
Merge "Add timezone for Telecom event date formatting"
Robert Greenwalt [Sat, 17 Jun 2017 00:37:20 +0000 (17:37 -0700)]
Add details to Download progress callback
Split decode into max size and current size.
Test: builds
Change-Id: Ice18d7f0e9ae99b3c24fe10843da80abd0d912d7
Hall Liu [Wed, 19 Jul 2017 21:57:56 +0000 (14:57 -0700)]
Add timezone for Telecom event date formatting
Output event times in local time rather than in UTC for compatibility
with the rest of the timestamps in the bug report
Test: manual
Change-Id: I2d458f09aec635a43e3d0565e8f8da803124f368
George Burgess IV [Wed, 19 Jul 2017 17:41:55 +0000 (17:41 +0000)]
Merge "Fix static analyzer complaints" am:
a3bde81205
am:
3e0a8b1d2b
Change-Id: Ia66a6a5ab4fd59772a5df71ede75227d353e5d25
George Burgess IV [Wed, 19 Jul 2017 17:36:23 +0000 (17:36 +0000)]
Merge "Fix static analyzer complaints"
am:
a3bde81205
Change-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa
Treehugger Robot [Wed, 19 Jul 2017 17:26:36 +0000 (17:26 +0000)]
Merge "Fix static analyzer complaints"
Steven Moreland [Wed, 19 Jul 2017 16:50:45 +0000 (09:50 -0700)]
frameworks/base: use proper nativehelper headers
libnativehelper exports headers under nativehelper. These were
available before incorrectly as global headers in order to give
access to jni.h.
Test: modules using frameworks/base find headers
Bug:
63762847
Change-Id: I0f9f231acdebe460f279135462f43d3e32eff64d
Carlos Vinueza [Wed, 19 Jul 2017 14:33:04 +0000 (14:33 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes" am:
1585b2e7b7
am:
3a6a8b9baa
Change-Id: I61ae7d0404463c160dd22675c84b0782f33a3c5d
Carlos Vinueza [Wed, 19 Jul 2017 14:26:55 +0000 (14:26 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
am:
1585b2e7b7
Change-Id: Ia85bdccb4c6b15c6b5b7974f4cb5cc34af04d8d1
Treehugger Robot [Wed, 19 Jul 2017 14:13:36 +0000 (14:13 +0000)]
Merge "Adding 26 free short codes for DCB and other purposes"
Neil Fuller [Wed, 19 Jul 2017 09:56:17 +0000 (09:56 +0000)]
Merge "Re-enable some test cases" am:
8feaad7249
am:
a76d88d26d
Change-Id: I03fcdebbe246fcffb92b7598d3084b3383982d98
Neil Fuller [Wed, 19 Jul 2017 09:51:17 +0000 (09:51 +0000)]
Merge "Re-enable some test cases"
am:
8feaad7249
Change-Id: I1b86866748afa6d6014abcbf59116a7abf67b54e
Neil Fuller [Wed, 19 Jul 2017 09:40:52 +0000 (09:40 +0000)]
Merge "Re-enable some test cases"
Hugo Benichi [Wed, 19 Jul 2017 08:09:38 +0000 (08:09 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone" am:
24a2adfa27
am:
f6883504c2
Change-Id: I432f419d1c8f93136a76cbadfd32018294b3e3d7
Hugo Benichi [Wed, 19 Jul 2017 08:04:48 +0000 (08:04 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
am:
24a2adfa27
Change-Id: I4be1d2ce67871c1e01364beca886fdd3af374321
Treehugger Robot [Wed, 19 Jul 2017 07:54:45 +0000 (07:54 +0000)]
Merge "ConnectivityServiceTest: fix testNetworkInfoOfTypeNone"
Hugo Benichi [Wed, 19 Jul 2017 01:10:52 +0000 (10:10 +0900)]
ConnectivityServiceTest: fix testNetworkInfoOfTypeNone
This patch fixes a couple of flakyness issues with
testNetworkInfoOfTypeNone. It also fixes some typos and naming issues.
Bug:
62918393,
62918393
Test: runtest frameworks-net
Change-Id: I1c56557ab113d3ef57dbc06a6e882634d03c5b09
Ricardo Loo [Wed, 19 Jul 2017 04:44:53 +0000 (04:44 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
am:
8e644a7510
Change-Id: I3d1a700fe2f5061601c8c874317da4f42ad83772
Ricardo Loo [Wed, 19 Jul 2017 04:36:42 +0000 (04:36 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
Steven Moreland [Wed, 19 Jul 2017 02:36:09 +0000 (02:36 +0000)]
Reference nativehelper/jni.h as jni.h
am:
d82cdb4624
Change-Id: I0c83f089c388f2e967323a0e74a8582904cb4cbd
Steven Moreland [Tue, 18 Jul 2017 02:00:43 +0000 (19:00 -0700)]
Reference nativehelper/jni.h as jni.h
nativehelper will no longer export nativehelper/jni.h so that everywhere
can reference this file with the same name.
Bug:
63762847
Change-Id: I3e58d478a2eb17b19db540414545a3c1f9c381af
(cherry picked from commit
98f40c71399e63f2b10cf6e3dffbbcea84d52490)
Android Build Merger (Role) [Wed, 19 Jul 2017 01:19:41 +0000 (01:19 +0000)]
Merge "Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours am:
ea6aaed42d" into oc-dev-plus-aosp
Phil Weaver [Wed, 19 Jul 2017 01:17:50 +0000 (01:17 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028 am:
72c56fb84a -s ours
am:
ea6aaed42d
Change-Id: I15d2da6b1acf1eb2b6b5126d04dd67274e7230fb
Hugo Benichi [Wed, 19 Jul 2017 01:15:12 +0000 (01:15 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration" am:
2627d4856b
am:
361162b636
Change-Id: Id72cd94c481bdc106ed022582399687b9abcc22b
Phil Weaver [Wed, 19 Jul 2017 01:10:58 +0000 (01:10 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028
am:
72c56fb84a -s ours
Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3
Hugo Benichi [Wed, 19 Jul 2017 01:06:59 +0000 (01:06 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
am:
2627d4856b
Change-Id: I087aee995858ae898f5d660c11552724a07503c3
Phil Weaver [Wed, 19 Jul 2017 01:01:06 +0000 (01:01 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d
am:
a84f7a3028
Change-Id: I1fedbee4642373e41c63c36ab83a0f4629c4a3d1
Treehugger Robot [Wed, 19 Jul 2017 00:58:11 +0000 (00:58 +0000)]
Merge "IpManager: fix test for default ProvisioningConfiguration"
Phil Weaver [Wed, 19 Jul 2017 00:53:13 +0000 (00:53 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
am:
4a1dc3458d
Change-Id: Ibc50787c078b4d68de37f12d57d4b14990b5c768
Phil Weaver [Wed, 19 Jul 2017 00:47:59 +0000 (00:47 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5 am:
d761dad216
am:
a81076b2e8
Change-Id: I1601d89e5c39e68361b03dff475f312d0e7fc22e
Phil Weaver [Wed, 19 Jul 2017 00:46:42 +0000 (00:46 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:42:05 +0000 (00:42 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5
am:
d761dad216
Change-Id: Ib2704ba352764d6f48467c129b2a2d4129408da0
Phil Weaver [Wed, 19 Jul 2017 00:30:58 +0000 (00:30 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a
am:
2da30457c5
Change-Id: If6d698d3d085c8a49a4b58ae5cc5005264558091
Phil Weaver [Wed, 19 Jul 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3
am:
edbe4bd86a
Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade
Phil Weaver [Wed, 19 Jul 2017 00:15:34 +0000 (00:15 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548
am:
afdcad0df3
Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe
Phil Weaver [Wed, 19 Jul 2017 00:04:51 +0000 (00:04 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours
am:
9e39e1e548
Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f
Phil Weaver [Tue, 18 Jul 2017 23:58:28 +0000 (23:58 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4
am:
996bc6bc12 -s ours
Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819
Robert Quattlebaum [Tue, 18 Jul 2017 23:43:46 +0000 (23:43 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN" am:
777c408a22
am:
6b0e6946c3
Change-Id: Ia6ceafa40c73589d516ca0d50168ba217b6af2c8
Billy Lam [Tue, 18 Jul 2017 23:42:13 +0000 (23:42 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd" am:
f126c41de7
am:
8e82bc9961
Change-Id: I4b9ecfcbe0e3757615ef4eca7602e4bf066a25e5
Phil Weaver [Tue, 18 Jul 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714
am:
9625d164e4
Change-Id: I0aa09448467dae806c9c5670ba8ed77e95a59da1
Lorenzo Colitti [Tue, 18 Jul 2017 23:37:57 +0000 (23:37 +0000)]
resolve merge conflicts of
a1d67fb38ec0 to stage-aosp-master
am:
8228eb3446
Change-Id: Ic9ba31da8e5281c9dbc8fa7ff56a63956a495b72
Phil Weaver [Tue, 18 Jul 2017 23:35:25 +0000 (23:35 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56
am:
0ddd7e4714
Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f
Robert Quattlebaum [Tue, 18 Jul 2017 23:33:08 +0000 (23:33 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
am:
777c408a22
Change-Id: I3ae9566ca52b9dae87cace18b1e97897eb8de0ad
Billy Lam [Tue, 18 Jul 2017 23:30:46 +0000 (23:30 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd"
am:
f126c41de7
Change-Id: I7025d5810dccb6b2637249063f08c80b1ab7e8d0
Phil Weaver [Tue, 18 Jul 2017 23:28:55 +0000 (23:28 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
am:
093c7a8e56
Change-Id: I7f734c7878cf065d15335602f9b0a6e02a786d53
Phil Weaver [Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
Treehugger Robot [Tue, 18 Jul 2017 23:09:58 +0000 (23:09 +0000)]
Merge "NetworkCapabilities: Unhide TRANSPORT_LOWPAN"
Lorenzo Colitti [Tue, 18 Jul 2017 21:17:33 +0000 (06:17 +0900)]
resolve merge conflicts of
a1d67fb38ec0 to stage-aosp-master
Test: make -j64 services
Change-Id: I3955b01189993f3051c608bc5d07a87e4e3b5f0b
Merged-In: Ic1e799c17b4bb0272cf85e03d5ad14981a55defa
Phil Weaver [Tue, 18 Jul 2017 22:33:34 +0000 (22:33 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35 am:
713a5420dd
am:
80c2eeedbb
Change-Id: Idf87c95beab3eb9030d0abeb2cf769e05b4a185d
Treehugger Robot [Tue, 18 Jul 2017 22:30:31 +0000 (22:30 +0000)]
Merge "GC in heapDumpFinished to cleanup hprof fd"
Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]
Back-port fixes for b/
62196835
Bug:
62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
Phil Weaver [Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35
am:
713a5420dd
Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e
Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390
am:
fef2328f35
Change-Id: Ifc093c5a322bdb94717cfaebe9a9bab255e22789
Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7 am:
cfbe89ad32 -s ours
am:
442fc85852
Change-Id: I1486a19f77bde9af02b7dab6f06b80b6bf0940da
Phil Weaver [Tue, 18 Jul 2017 22:03:40 +0000 (22:03 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours
am:
2a93c3d390
Change-Id: I11d0935ed851e3c6076fb972a721d42e4903c6de
Phil Weaver [Tue, 18 Jul 2017 21:59:29 +0000 (21:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7
am:
cfbe89ad32 -s ours
Change-Id: I20741c5be51498f1d9a44452784fa59d31a12b2e
Phil Weaver [Tue, 18 Jul 2017 21:57:16 +0000 (21:57 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a am:
982cf0d212 -s ours
am:
4607ec8f6d
Change-Id: Ic51570a1b13563cd084cd03389d4cf7f2654df8b
Phil Weaver [Tue, 18 Jul 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8
am:
4fa8b51c0c -s ours
Change-Id: I72897fd488d26ed7c3e1462c1755e10d2b7dfbe8
Phil Weaver [Tue, 18 Jul 2017 21:50:57 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f
am:
ac700bc3c7
Change-Id: If57bab0ee9d5459286339845284adb3f0163c401
Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a
am:
982cf0d212 -s ours
Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903
Phil Weaver [Tue, 18 Jul 2017 21:44:32 +0000 (21:44 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev
am:
0b0834fbe8
Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb
Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db
am:
d2c4007d8a
Change-Id: I9c749eb931db880073de06259232f5f03c91cd32
Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c
am:
b2e3fb162f
Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e
Phil Weaver [Tue, 18 Jul 2017 21:31:32 +0000 (21:31 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f am:
faded53018
am:
3700014be0
Change-Id: I4d831e16f45fd2855a257551fa55182147b7bf2e
Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f
am:
faded53018
Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c
Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f
am:
27ad1fbc2c
Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42
Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69
am:
783253f6db
Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329
Phil Weaver [Tue, 18 Jul 2017 21:23:16 +0000 (21:23 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957
am:
79c476704f
Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63
Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours
am:
bbb567757f
Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b
Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae
am:
aa8976fa69
Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e
Phil Weaver [Tue, 18 Jul 2017 21:13:40 +0000 (21:13 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e
am:
a1dca32957
Change-Id: I5fdeb9f94184dcba41d7e00c129c986d8d1febb9
Phil Weaver [Tue, 18 Jul 2017 21:09:40 +0000 (21:09 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours
am:
f44b48acae
Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad
Phil Weaver [Tue, 18 Jul 2017 21:07:43 +0000 (21:07 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94
am:
7e82d6204f -s ours
Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78
Phil Weaver [Tue, 18 Jul 2017 21:07:11 +0000 (21:07 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c
am:
b968d99e3e
Change-Id: I0ea936af7cd1c217d509fa56367a4260e5dab81a
Phil Weaver [Tue, 18 Jul 2017 21:00:36 +0000 (21:00 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d
am:
cf7ce06abd -s ours
Change-Id: Ibef3aded20e00e9beef1ec189f1a471d978354e2
Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4
am:
5264237c94
Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178
Phil Weaver [Tue, 18 Jul 2017 20:59:49 +0000 (20:59 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89
am:
83261a8b5c
Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8
Phil Weaver [Tue, 18 Jul 2017 20:55:18 +0000 (20:55 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed
am:
62eca82f89
Change-Id: I9a274bfc59f545076adeb2a82cde269457eecc67
Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb
am:
f05a6fc52d
Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33
OSDN Git Service
