OSDN Git Service
Android Build Merger (Role) [Thu, 6 Jul 2017 08:28:13 +0000 (08:28 +0000)]
Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp am:
d29b77a59e -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:25:13 +0000 (08:25 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
am:
d29b77a59e -s ours
Change-Id: Ie604bafda0f2259c6f2a9a6c4fe3964e9ba01384
Android Build Merger (Role) [Thu, 6 Jul 2017 08:24:27 +0000 (08:24 +0000)]
Merge "Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp am:
4568cf1c82 -s ours" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 08:22:45 +0000 (08:22 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp am:
94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:22:32 +0000 (08:22 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
am:
4568cf1c82 -s ours
Change-Id: I1ea2c650ed2a45265caa440c1d82efd724b57a15
Android Build Merger (Role) [Thu, 6 Jul 2017 08:21:28 +0000 (08:21 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp am:
94a7d5bfcf -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:21:03 +0000 (08:21 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp
am:
94a7d5bfcf -s ours
Change-Id: I0388ba2add121b330b8ddf4f75a0d6a04f0c2254
Erik Kline [Thu, 6 Jul 2017 08:20:09 +0000 (08:20 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp
am:
94a7d5bfcf -s ours
Change-Id: I8cc27f38c1787859ebaae075f40649dbf6169e7e
Android Build Merger (Role) [Thu, 6 Jul 2017 08:20:08 +0000 (08:20 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56 am:
462232a92f -s ours" into oc-dr1-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:19:02 +0000 (08:19 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56
am:
462232a92f -s ours
Change-Id: I29b398c6665083e0807a5ff0f84cb8b074642820
Erik Kline [Thu, 6 Jul 2017 08:18:12 +0000 (08:18 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56
am:
462232a92f -s ours
Change-Id: I9945181d664321b968dd6f348699b344f5f73390
Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:28 +0000 (08:13 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 08:13:00 +0000 (08:13 +0000)]
Merge "Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master am:
311b2a31fa" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:11:55 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
am:
311b2a31fa
Change-Id: If2fa9371bc286d2115167b8187f641ec9dfb89a9
Erik Kline [Thu, 6 Jul 2017 08:11:44 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
am:
311b2a31fa
Change-Id: I462aa9d52205b1dff46b074e5a13945c34e96890
Android Build Merger (Role) [Thu, 6 Jul 2017 08:11:03 +0000 (08:11 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19 am:
aa9d12fa56" into oc-dev-plus-aosp
Erik Kline [Thu, 6 Jul 2017 08:10:00 +0000 (08:10 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19
am:
aa9d12fa56
Change-Id: Iae705d2522f1a21e7aa970a4c16efd41943031ab
Erik Kline [Thu, 6 Jul 2017 08:09:13 +0000 (08:09 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19
am:
aa9d12fa56
Change-Id: I9097493cec6ac13dc027ee1d2f13bbe52679e674
Android Build Merger (Role) [Thu, 6 Jul 2017 08:04:24 +0000 (08:04 +0000)]
Merge "Merge "Clearly log tether_offload_disabled setting status in start()" am:
b171a46d19" into stage-aosp-master
Erik Kline [Thu, 6 Jul 2017 08:03:19 +0000 (08:03 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
am:
b171a46d19
Change-Id: Ic74dcee4e473e4b6498b16affad88706bb4a6b7e
Erik Kline [Thu, 6 Jul 2017 08:02:44 +0000 (08:02 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
am:
b171a46d19
Change-Id: I999926bf0b67b12caadeea2d3766d8f69913bafe
Treehugger Robot [Thu, 6 Jul 2017 07:54:33 +0000 (07:54 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()"
Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]
Clearly log tether_offload_disabled setting status in start()
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: I113358ef71c2e5e3254eb6f9fbf9d5721825b0df
Merged-In: Iebcdb7bfaa85f822e73fe2f3b54caceb5420709c
Merged-In: Ifce832dca7b4d8b3056e2a9e91d38bffe25cfeb6
Merged-In: I99f6abc31579b4b25589452c44e1834a7ba4e591
Merged-In: I312a9309d6934bcec7fc0245cad12b97f1a22521
Lorenzo Colitti [Thu, 6 Jul 2017 06:31:54 +0000 (06:31 +0000)]
Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev
am:
cf694adee3
Change-Id: Ie6c5d55ce610a44b627eb8a7c46b897146f0e051
TreeHugger Robot [Thu, 6 Jul 2017 06:14:00 +0000 (06:14 +0000)]
Merge "Add strings for a "Tethering hardware acceleration" setting." into oc-dr1-dev
Erik Kline [Thu, 6 Jul 2017 05:56:14 +0000 (05:56 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev
am:
f12ff31046
Change-Id: I99f6abc31579b4b25589452c44e1834a7ba4e591
TreeHugger Robot [Thu, 6 Jul 2017 05:47:59 +0000 (05:47 +0000)]
Merge "Clearly log tether_offload_disabled setting status in start()" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 05:27:28 +0000 (05:27 +0000)]
Merge "Merge "Fix NPE on network forget from details page." into oc-dr1-dev am:
e59ba746f1" into oc-dr1-dev-plus-aosp
Sundeep Ghuman [Thu, 6 Jul 2017 05:25:45 +0000 (05:25 +0000)]
Merge "Fix NPE on network forget from details page." into oc-dr1-dev
am:
e59ba746f1
Change-Id: I419395b77528e5a200411b88940e05af310c37d6
Sundeep Ghuman [Thu, 6 Jul 2017 05:24:56 +0000 (05:24 +0000)]
Merge "Fix NPE on network forget from details page." into oc-dr1-dev
am:
e59ba746f1
Change-Id: I9bb7d9e9ea8b174ba2fe1d77d110cef658e152c8
TreeHugger Robot [Thu, 6 Jul 2017 05:16:14 +0000 (05:16 +0000)]
Merge "Fix NPE on network forget from details page." into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 03:49:05 +0000 (03:49 +0000)]
Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am:
161d65640e" into oc-dr1-dev-plus-aosp
Winson Chung [Thu, 6 Jul 2017 03:47:54 +0000 (03:47 +0000)]
Merge "Moving check for empty snapshots earlier." into oc-dr1-dev
am:
161d65640e
Change-Id: Ib6e32651f0a24462485d8671f9122af297fcb5ba
Android Build Merger (Role) [Thu, 6 Jul 2017 03:47:22 +0000 (03:47 +0000)]
Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am:
7ee9ec59d8" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 03:46:47 +0000 (03:46 +0000)]
Merge "Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp am:
f9d61556b6" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 03:46:23 +0000 (03:46 +0000)]
Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am:
161d65640e" into oc-dr1-dev-plus-aosp
Winson Chung [Thu, 6 Jul 2017 03:45:54 +0000 (03:45 +0000)]
Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev
am:
7ee9ec59d8
Change-Id: I3dddc7358cf0147dbd334f9f7e0ec7365048b65b
Android Build Merger (Role) [Thu, 6 Jul 2017 03:45:41 +0000 (03:45 +0000)]
Merge "Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp am:
f9d61556b6" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:45:19 +0000 (03:45 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
am:
f9d61556b6
Change-Id: Ic3cbe67db2d913cc8d75572efbe2ab2e6c0e1faa
Winson Chung [Thu, 6 Jul 2017 03:45:00 +0000 (03:45 +0000)]
Merge "Moving check for empty snapshots earlier." into oc-dr1-dev
am:
161d65640e
Change-Id: If3cf85a88f3d6788042372b4e21ecedc121dfa3a
Android Build Merger (Role) [Thu, 6 Jul 2017 03:44:49 +0000 (03:44 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp am:
b4efa159a1" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:44:29 +0000 (03:44 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
am:
f9d61556b6
Change-Id: I77a2e1556bae4cc46907e1862ffe5e9585b68394
Android Build Merger (Role) [Thu, 6 Jul 2017 03:44:26 +0000 (03:44 +0000)]
Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am:
7ee9ec59d8" into oc-dr1-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:43:15 +0000 (03:43 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp
am:
b4efa159a1
Change-Id: I69e599f342bd8f9fac492a1714eedcea2887097f
Winson Chung [Thu, 6 Jul 2017 03:43:07 +0000 (03:43 +0000)]
Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev
am:
7ee9ec59d8
Change-Id: I2a51560ea4f07b3eacf882e74385c20d4e416c35
Mathieu Chartier [Thu, 6 Jul 2017 03:42:45 +0000 (03:42 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp
am:
b4efa159a1
Change-Id: Iafc99265978f5352c35c13b9ea1329769bc23db0
Erik Kline [Thu, 6 Jul 2017 03:38:48 +0000 (12:38 +0900)]
Clearly log tether_offload_disabled setting status in start()
Test: as follows
- built
- flashed
- booted
- "runtest frameworks-net" passes
Bug:
29337859
Bug:
32163131
Change-Id: I312a9309d6934bcec7fc0245cad12b97f1a22521
Android Build Merger (Role) [Thu, 6 Jul 2017 03:37:55 +0000 (03:37 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5 am:
94edf0241f" into oc-dr1-dev-plus-aosp
Winson Chung [Thu, 6 Jul 2017 03:36:47 +0000 (03:36 +0000)]
Merge "Moving check for empty snapshots earlier." into oc-dr1-dev
Mathieu Chartier [Thu, 6 Jul 2017 03:36:23 +0000 (03:36 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5
am:
94edf0241f
Change-Id: I7bef329f5972b61cba5a4b3dce66970d8c0a7802
Mathieu Chartier [Thu, 6 Jul 2017 03:36:11 +0000 (03:36 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5
am:
94edf0241f
Change-Id: Ifb85ebb263e7dad28f5995950082ed23db4c0c37
Winson Chung [Thu, 6 Jul 2017 03:35:50 +0000 (03:35 +0000)]
Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev
Android Build Merger (Role) [Thu, 6 Jul 2017 03:33:18 +0000 (03:33 +0000)]
Merge "Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master am:
e62a5fc7d3" into oc-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:31:51 +0000 (03:31 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master
am:
e62a5fc7d3
Change-Id: I1c87dc82499ac1a53ba3a6c14d79586b4d7db986
Android Build Merger (Role) [Thu, 6 Jul 2017 03:31:10 +0000 (03:31 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446 am:
10f5f8dde5" into oc-dev-plus-aosp
Mathieu Chartier [Thu, 6 Jul 2017 03:29:49 +0000 (03:29 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446
am:
10f5f8dde5
Change-Id: I80156aebfba5f0a8e914163b420a2676658e9826
Mathieu Chartier [Thu, 6 Jul 2017 03:28:05 +0000 (03:28 +0000)]
Merge "ProcessStats: fix uss average value offset" am:
b355b7f446
am:
10f5f8dde5
Change-Id: I213eef696c40c0260b32c71fac18b1e5063dc77d
Android Build Merger (Role) [Thu, 6 Jul 2017 03:27:09 +0000 (03:27 +0000)]
Merge "Bluetooth: Display battery level of connected devices am:
6258aae548" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 03:25:23 +0000 (03:25 +0000)]
Merge "Merge "ProcessStats: fix uss average value offset" am:
b355b7f446" into stage-aosp-master
Jack He [Thu, 6 Jul 2017 03:25:02 +0000 (03:25 +0000)]
Bluetooth: Display battery level of connected devices
am:
6258aae548
Change-Id: I24768c7c4353e1fe0100206f402daa34df54517f
Mathieu Chartier [Thu, 6 Jul 2017 03:23:39 +0000 (03:23 +0000)]
Merge "ProcessStats: fix uss average value offset"
am:
b355b7f446
Change-Id: I8ea2d783c0e9c749e923b7a37b2268d0c186851e
Jack He [Thu, 6 Jul 2017 03:23:35 +0000 (03:23 +0000)]
Bluetooth: Display battery level of connected devices
am:
6258aae548
Change-Id: I511f71b349b08652e22698313e1c48139f426eb5
Mathieu Chartier [Thu, 6 Jul 2017 03:23:21 +0000 (03:23 +0000)]
Merge "ProcessStats: fix uss average value offset"
am:
b355b7f446
Change-Id: I3347a5b4d3df895b7066c5117f37003e4603ebd9
Mathieu Chartier [Thu, 6 Jul 2017 03:13:52 +0000 (03:13 +0000)]
Merge "ProcessStats: fix uss average value offset"
Sundeep Ghuman [Thu, 6 Jul 2017 03:06:05 +0000 (20:06 -0700)]
Fix NPE on network forget from details page.
Forgetting a network from the wifi network details page throws an NPE in
WifiSettings when the details fragment exits, crashing the app.
Bug: b/
63351286
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/AccessPointTest.java
Change-Id: I749ecbda5654ff7a86ffe4c38ca74ebe338923f0
Android Build Merger (Role) [Thu, 6 Jul 2017 02:31:24 +0000 (02:31 +0000)]
Merge "Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp am:
d0d81258a4" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 02:29:14 +0000 (02:29 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp
am:
d0d81258a4
Change-Id: I8aaf9e05e76642d5f6bb975929f39cdaf0835fdd
Android Build Merger (Role) [Thu, 6 Jul 2017 02:28:49 +0000 (02:28 +0000)]
Merge "Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp am:
d0d81258a4" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 02:27:09 +0000 (02:27 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd am:
8f35f915a9" into oc-dr1-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 02:27:08 +0000 (02:27 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp
am:
d0d81258a4
Change-Id: I4ad0804618a37731c31830aec4ea1dad5c700014
Hall Liu [Thu, 6 Jul 2017 02:25:08 +0000 (02:25 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd
am:
8f35f915a9
Change-Id: I1762a29fc24d09fbbe5313889e48daae7e29515b
Hall Liu [Thu, 6 Jul 2017 02:24:04 +0000 (02:24 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd
am:
8f35f915a9
Change-Id: Ib77007f944fe74cb76a2c0987aabcc376810038f
Android Build Merger (Role) [Thu, 6 Jul 2017 02:19:35 +0000 (02:19 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f am:
5e7c98bb6a am:
812d0866b1" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 02:18:06 +0000 (02:18 +0000)]
Merge "Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master am:
809edde8fd" into oc-dev-plus-aosp
Hall Liu [Thu, 6 Jul 2017 02:17:56 +0000 (02:17 +0000)]
Merge "Update DownloadRequest API" am:
fa42eea98f am:
5e7c98bb6a
am:
812d0866b1
Change-Id: I56a3f08b02c828c750f859311baa201bb7e3b569
Hall Liu [Thu, 6 Jul 2017 02:16:11 +0000 (02:16 +0000)]
Merge "Update DownloadRequest API" am:
fa42eea98f am:
5e7c98bb6a
am:
812d0866b1
Change-Id: I10eca003e37657c6582718c70c39ac7f54badbae
Hall Liu [Thu, 6 Jul 2017 02:15:43 +0000 (02:15 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
am:
809edde8fd
Change-Id: I297c4d5917b63f0215c2907f32b8e23d0f4ee4bf
Hall Liu [Thu, 6 Jul 2017 02:14:40 +0000 (02:14 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
am:
809edde8fd
Change-Id: Ie3c620a0e45f85ef0446d6d58865d6f55b731531
Hall Liu [Thu, 6 Jul 2017 02:10:30 +0000 (02:10 +0000)]
Merge "Update DownloadRequest API" am:
fa42eea98f
am:
5e7c98bb6a
Change-Id: Ie5a323b8a0c96f7a7f63eea1b0163bb7e5bf4ea7
Android Build Merger (Role) [Thu, 6 Jul 2017 02:07:32 +0000 (02:07 +0000)]
Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp am:
bdbe454b7a" into oc-dr1-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 02:06:28 +0000 (02:06 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp
am:
bdbe454b7a
Change-Id: I341dcd5139cb17c0375837e6b1d64a683a75ce64
Android Build Merger (Role) [Thu, 6 Jul 2017 02:06:14 +0000 (02:06 +0000)]
Merge "Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp am:
bdbe454b7a" into oc-dr1-dev-plus-aosp
Android Build Merger (Role) [Thu, 6 Jul 2017 02:06:02 +0000 (02:06 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp am:
808ae634dd" into oc-dr1-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 02:05:20 +0000 (02:05 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp
am:
bdbe454b7a
Change-Id: Ie830aa79d8a380fcf85fac617ab183b02819468a
Android Build Merger (Role) [Thu, 6 Jul 2017 02:05:16 +0000 (02:05 +0000)]
Merge "Merge "Update DownloadRequest API" am:
fa42eea98f" into stage-aosp-master
Hiroki Yamamoto [Thu, 6 Jul 2017 02:04:52 +0000 (02:04 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp
am:
808ae634dd
Change-Id: I1e9c347aa7b3722cda19d1c6f3ec34adb93ea08c
Hiroki Yamamoto [Thu, 6 Jul 2017 02:03:49 +0000 (02:03 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp
am:
808ae634dd
Change-Id: Ia9b125871b38845184db1bcedfc22ac9df9bb9ee
Hall Liu [Thu, 6 Jul 2017 02:03:42 +0000 (02:03 +0000)]
Merge "Update DownloadRequest API"
am:
fa42eea98f
Change-Id: I0b966f0fa2ca3e1c45bf4932654a3bbc1b2d05eb
Hall Liu [Thu, 6 Jul 2017 02:03:16 +0000 (02:03 +0000)]
Merge "Update DownloadRequest API"
am:
fa42eea98f
Change-Id: I4c822f653900cab34276b2b4ba5fb1a29e948a76
Android Build Merger (Role) [Thu, 6 Jul 2017 02:00:37 +0000 (02:00 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e am:
3ccfa35667" into oc-dr1-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 01:58:59 +0000 (01:58 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e
am:
3ccfa35667
Change-Id: I45ba5cbd9eda39c10c5a26405766905e45eaa6ea
Hiroki Yamamoto [Thu, 6 Jul 2017 01:58:38 +0000 (01:58 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e
am:
3ccfa35667
Change-Id: Iff5f7c0562be48e8fda71dde5790a41876f125ba
Android Build Merger (Role) [Thu, 6 Jul 2017 01:55:35 +0000 (01:55 +0000)]
Merge "Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master am:
17f2f1633b" into oc-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 01:54:37 +0000 (01:54 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master
am:
17f2f1633b
Change-Id: Icfc920a97ab07f01f9c5d9def88f4bcc63bd6058
Android Build Merger (Role) [Thu, 6 Jul 2017 01:53:59 +0000 (01:53 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc am:
1a6d0d753e" into oc-dev-plus-aosp
Hiroki Yamamoto [Thu, 6 Jul 2017 01:53:01 +0000 (01:53 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc
am:
1a6d0d753e
Change-Id: I588cd14481ed540dacd85646f52e7b98d1bc58b9
Hiroki Yamamoto [Thu, 6 Jul 2017 01:52:15 +0000 (01:52 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc
am:
1a6d0d753e
Change-Id: I7e45537f7a81ac42be1a24adeadfbf3f7b665109
Hall Liu [Thu, 6 Jul 2017 01:52:04 +0000 (01:52 +0000)]
Merge "Update DownloadRequest API"
Android Build Merger (Role) [Thu, 6 Jul 2017 01:47:37 +0000 (01:47 +0000)]
Merge "Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover" am:
21187ba5cc" into stage-aosp-master
Hiroki Yamamoto [Thu, 6 Jul 2017 01:46:20 +0000 (01:46 +0000)]
Merge "Protect TIMEOUT_CONNECT broadcast which is for Nfc Handover"
am:
21187ba5cc
Change-Id: I9117f76d5a03d3aa222c87338bd7249184b3041d
OSDN Git Service
