git.osdn.net Git - android-x86/frameworks-base.git/log

Sundeep Ghuman [Thu, 6 Jul 2017 05:31:13 +0000 (05:31 +0000)]

Merge "Fix NPE on network forget from details page." into oc-dr1-dev am: e59ba746f1
am: 58b665f4b5

Change-Id: Ic9733769fe3507c9c8409cec28e452d26314bfde

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:14:39 +0000 (04:14 +0000)]

Merge "Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp am: 509bfe5fb5"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:14:04 +0000 (04:14 +0000)]

Merge "Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp am: 509bfe5fb5"

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:13:09 +0000 (04:13 +0000)]

Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp
am: 509bfe5fb5

Change-Id: Ie15a7478b9a56dab9bbcb91a3b01af7f55008101

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:12:37 +0000 (04:12 +0000)]

Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp
am: 509bfe5fb5

Change-Id: I629e0117f5e9150786165ef45bba046a8a298478

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:12:28 +0000 (04:12 +0000)]

Merge "Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp am: 3fd761f85d"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:11:58 +0000 (04:11 +0000)]

Merge "Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp am: 3fd761f85d"

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:10:46 +0000 (04:10 +0000)]

Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp
am: 3fd761f85d

Change-Id: Ib0c3e613fc916dd8b9fe32b2e49fd14cf4de22b2

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:10:15 +0000 (04:10 +0000)]

Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp
am: 3fd761f85d

Change-Id: I0910da7d82f7594f63c9b27931488ad46f877d9d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:09:43 +0000 (04:09 +0000)]

Merge "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 am: 9ccde57ad6"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:09:34 +0000 (04:09 +0000)]

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 04:08:09 +0000 (04:08 +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
am: 9ccde57ad6

Change-Id: Iccaa1eccdb94283ed68255904270bed2f7043d6c

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:07:37 +0000 (04:07 +0000)]

Merge "Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp am: b66c014d1b"

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 04:07:18 +0000 (04:07 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:06:38 +0000 (04:06 +0000)]

Merge "Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp am: b66c014d1b"

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:05:29 +0000 (04:05 +0000)]

Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp
am: b66c014d1b

Change-Id: I6bb9eeeb1c1b75f4901a436ace5c95e70cbebeb7

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 04:04:26 +0000 (04:04 +0000)]

Merge "Merge "Moving check for empty snapshots earlier." into oc-dr1-dev am: 161d65640e" into oc-dr1-dev-plus-aosp
am: b66c014d1b

Change-Id: I007315a09378834a852f965c026f45e215a1f56d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:04:26 +0000 (04:04 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:03:58 +0000 (04:03 +0000)]

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 04:03:05 +0000 (04:03 +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
am: b01ab9a816

Change-Id: Id66efe852a0018d851c0c63dde2a9bbfedee98f8

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:02:17 +0000 (04:02 +0000)]

Merge "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 am: 4a383c9c5b"

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 04:02:09 +0000 (04:02 +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
am: b01ab9a816

Change-Id: I6dbe71816b10649c6e5dce72410653d35f2765fa

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 04:00:50 +0000 (04:00 +0000)]

Merge "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 am: 4a383c9c5b"

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 04:00:45 +0000 (04:00 +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
am: 4a383c9c5b

Change-Id: Ia01e3b927944a505424053d1cf090dbe971d48bb

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:59:08 +0000 (03:59 +0000)]

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 03:58:41 +0000 (03:58 +0000)]

Merge "Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp am: 74dd99a90a"

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 03:57:16 +0000 (03:57 +0000)]

Merge "Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev am: 7ee9ec59d8" into oc-dr1-dev-plus-aosp
am: 74dd99a90a

Change-Id: Ide9d78fd556f66bb4e03136b46c7a2912e4316d5

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 03:56:31 +0000 (03:56 +0000)]

Merge "Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446 am: 10f5f8dde5" into oc-dev-plus-aosp am: b4efa159a1 am: 44ac9ca453"

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:54:53 +0000 (03:54 +0000)]

Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446 am: 10f5f8dde5" into oc-dev-plus-aosp am: b4efa159a1
am: 44ac9ca453

Change-Id: I23ca63640d66622185dd0cedc4d4cd0b49b35866

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:54:50 +0000 (03:54 +0000)]

Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446 am: 10f5f8dde5" into oc-dev-plus-aosp am: b4efa159a1
am: 44ac9ca453

Change-Id: I4fec511cc7051976c0b566ef46ad5c8a49b3144c

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:45:08 +0000 (03:45 +0000)]

Merge "Merge "ProcessStats: fix uss average value offset" am: b355b7f446 am: 10f5f8dde5 am: 94edf0241f" into oc-dr1-dev-plus-aosp
am: c632fbeb9e

Change-Id: I8cfaa101fd256c64afbd868cbf18b59a2dbc07dd

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:43:11 +0000 (03:43 +0000)]

Merge "ProcessStats: fix uss average value offset" am: b355b7f446 am: 10f5f8dde5 am: 94edf0241f
am: 355d0f5e7b

Change-Id: I37b352cfa9c093ae259be141c9b9167ea58c8bd3

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Winson Chung [Thu, 6 Jul 2017 03:36:47 +0000 (03:36 +0000)]

Merge "Moving check for empty snapshots earlier." into oc-dr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 03:35:48 +0000 (03:35 +0000)]

Merge "Merge "Bluetooth: Display battery level of connected devices am: 6258aae548" into oc-dr1-dev-plus-aosp am: f72404a026"

commit | commitdiff | tree

Jack He [Thu, 6 Jul 2017 03:33:26 +0000 (03:33 +0000)]

Merge "Bluetooth: Display battery level of connected devices am: 6258aae548" into oc-dr1-dev-plus-aosp
am: f72404a026

Change-Id: I09c4fc2a8a9bbaecc37dbf1fefd17e3fdc74e6f2

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 03:32:57 +0000 (03:32 +0000)]

Merge "Bluetooth: Display battery level of connected devices am: 6258aae548 am: 199849631b"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jack He [Thu, 6 Jul 2017 03:30:39 +0000 (03:30 +0000)]

Bluetooth: Display battery level of connected devices am: 6258aae548
am: 199849631b

Change-Id: Id9a045b646cff8eee7a99b05b758780e5afbbb95

commit | commitdiff | tree

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

commit | commitdiff | tree

Jack He [Thu, 6 Jul 2017 03:29:48 +0000 (03:29 +0000)]

Bluetooth: Display battery level of connected devices am: 6258aae548
am: 199849631b

Change-Id: I56f073605bc0f4223a1c0f3a385977e2b7c44879

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Mathieu Chartier [Thu, 6 Jul 2017 03:13:52 +0000 (03:13 +0000)]

Merge "ProcessStats: fix uss average value offset"

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:47:30 +0000 (02:47 +0000)]

Merge "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 am: cd5a7115c8"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:46:58 +0000 (02:46 +0000)]

Merge "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 am: 8e995823c9"

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:44:51 +0000 (02:44 +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
am: 8e995823c9

Change-Id: I39ee1311f760bb6f4cebfb8f0d3581f1cb0e852a

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:44:37 +0000 (02:44 +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
am: cd5a7115c8

Change-Id: I5a4e99c8b63860eac83ba2200f608b7af72e3c3a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:44:19 +0000 (02:44 +0000)]

Merge "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 am: cd5a7115c8"

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:43:14 +0000 (02:43 +0000)]

Merge "Merge "Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master am: 809edde8fd am: 8f35f915a9" into oc-dr1-dev-plus-aosp am: ffa220c119"

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:41:46 +0000 (02:41 +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
am: cd5a7115c8

Change-Id: Iccf160697e834cbaf600e01ad35540cd7895fbe4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:40:45 +0000 (02:40 +0000)]

Merge "Merge "Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master am: 809edde8fd am: 8f35f915a9" into oc-dr1-dev-plus-aosp am: ffa220c119"

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:40:40 +0000 (02:40 +0000)]

Merge "Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master am: 809edde8fd am: 8f35f915a9" into oc-dr1-dev-plus-aosp
am: ffa220c119

Change-Id: I0c29dae24726b5fc5f354fb0ff1c62453b4aecd7

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:39:49 +0000 (02:39 +0000)]

Merge "Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master am: 809edde8fd am: 8f35f915a9 am: 43c3e40324"

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:38:48 +0000 (02:38 +0000)]

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:37:44 +0000 (02:37 +0000)]

Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master am: 809edde8fd am: 8f35f915a9
am: 43c3e40324

Change-Id: Ibe3cff1791a1ebd28bf9e9ac8b80e9428d366f82

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:35:22 +0000 (02:35 +0000)]

Merge "Merge "Update DownloadRequest API" am: fa42eea98f" into stage-aosp-master am: 809edde8fd am: 8f35f915a9
am: 43c3e40324

Change-Id: Icc99d5c742e19771346ca4404e834497f9084c73

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:31:33 +0000 (02:31 +0000)]

Merge "Merge "Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1" into oc-dr1-dev-plus-aosp am: 9d08a4b12a"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:28:54 +0000 (02:28 +0000)]

Merge "Merge "Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1" into oc-dr1-dev-plus-aosp am: 9d08a4b12a"

commit | commitdiff | tree

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

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:28:47 +0000 (02:28 +0000)]

Merge "Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1" into oc-dr1-dev-plus-aosp
am: 9d08a4b12a

Change-Id: Icec99d06cb2e8cc9fa089c4cc5edcb0fc700f739

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:27:47 +0000 (02:27 +0000)]

Merge "Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1 am: 64ec5d3547"

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:27:17 +0000 (02:27 +0000)]

Merge "Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1" into oc-dr1-dev-plus-aosp
am: 9d08a4b12a

Change-Id: I2ad7f368e75e8679aa17c585d9475c1af19c41eb

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:25:19 +0000 (02:25 +0000)]

Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1
am: 64ec5d3547

Change-Id: I98c42ead29a83b16b086f8ecef294bd4d959b6c6

commit | commitdiff | tree

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

commit | commitdiff | tree

Hall Liu [Thu, 6 Jul 2017 02:24:36 +0000 (02:24 +0000)]

Merge "Update DownloadRequest API" am: fa42eea98f am: 5e7c98bb6a am: 812d0866b1
am: 64ec5d3547

Change-Id: Ie96d8b2ce004094b2dfd23939e4b2e19f62307c5

commit | commitdiff | tree

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

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 6 Jul 2017 02:21:09 +0000 (02:21 +0000)]

Merge "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 am: 15a1363463"