OSDN Git Service
Michal Karpinski [Fri, 2 Dec 2016 11:56:31 +0000 (11:56 +0000)]
Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev
am:
3db0a14ab0
Change-Id: I72adcc2aee7f13aa34449ec5ff57e3ab6a62eacc
Michal Karpinski [Fri, 2 Dec 2016 11:43:02 +0000 (11:43 +0000)]
resolve merge conflicts of
7f9014b to nyc-mr2-dev-plus-aosp
Change-Id: I9c08147c7a39f3121b5d817c2f498c9ad93066f3
Michal Karpinski [Fri, 2 Dec 2016 09:26:26 +0000 (09:26 +0000)]
Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev
Jack He [Fri, 2 Dec 2016 05:10:07 +0000 (05:10 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am:
7dd909684f am:
33f0cf1267
am:
7ef7e18636
Change-Id: If0b00c67b9f3183669ceca45d23e5a463c283681
Jack He [Fri, 2 Dec 2016 04:58:34 +0000 (04:58 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am:
7dd909684f
am:
33f0cf1267
Change-Id: I1cb33a340524aeb579330bd49affd02670e89c5a
Jack He [Fri, 2 Dec 2016 04:49:39 +0000 (04:49 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
am:
7dd909684f
Change-Id: Ib90b23ef7b4271e2adc8a3c66963aaeb5c70a66f
Treehugger Robot [Fri, 2 Dec 2016 04:37:47 +0000 (04:37 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
Android Build Merger (Role) [Fri, 2 Dec 2016 04:05:28 +0000 (04:05 +0000)]
Merge "Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am:
1981812450 am:
de04a0480a" into nyc-mr1-dev-plus-aosp am:
8d8cfa2345" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 2 Dec 2016 04:05:11 +0000 (04:05 +0000)]
Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a am:
e9e77f2603" into nyc-mr2-dev-plus-aosp
Christine Hallstrom [Fri, 2 Dec 2016 04:04:23 +0000 (04:04 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a
am:
e9e77f2603
Change-Id: I50aa8a739f8bf6e5697de8c6f45cfa1c9610f7ac
Android Build Merger (Role) [Fri, 2 Dec 2016 04:03:47 +0000 (04:03 +0000)]
Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am:
1981812450 am:
de04a0480a am:
0fbd9b7773" into nyc-mr2-dev-plus-aosp
Mark Salyzyn [Fri, 2 Dec 2016 04:03:00 +0000 (04:03 +0000)]
Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am:
1981812450 am:
de04a0480a" into nyc-mr1-dev-plus-aosp
am:
8d8cfa2345
Change-Id: Ibb88157c980597ec7a6fd1141736e0c67b068bd7
Mark Salyzyn [Fri, 2 Dec 2016 04:02:55 +0000 (04:02 +0000)]
Merge "jni: EventLog replace open coding with android_log_event_list" am:
1981812450 am:
de04a0480a
am:
0fbd9b7773
Change-Id: If711f660c7c6b203a8a8e0b54073ded64d686c1e
Android Build Merger (Role) [Fri, 2 Dec 2016 04:02:28 +0000 (04:02 +0000)]
Merge "Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a" into nyc-mr1-dev-plus-aosp am:
325e93dfa3" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 2 Dec 2016 04:02:02 +0000 (04:02 +0000)]
Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a am:
5599fb3795" into nyc-mr2-dev-plus-aosp
Christine Hallstrom [Fri, 2 Dec 2016 04:01:11 +0000 (04:01 +0000)]
Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a" into nyc-mr1-dev-plus-aosp
am:
325e93dfa3
Change-Id: I4111cc7e11a410a3160f2cab5fe16cbd26a91db9
Christine Hallstrom [Fri, 2 Dec 2016 04:01:06 +0000 (04:01 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a
am:
5599fb3795
Change-Id: I59ecf91d4178dc55b7cbab9ec3f93524f8bcfe62
Android Build Merger (Role) [Fri, 2 Dec 2016 04:00:19 +0000 (04:00 +0000)]
Merge "Merge "Get the correct operator name" am:
297e9f9a32 am:
2232ac8c59 am:
18a0e81a06" into nyc-mr2-dev-plus-aosp
Robert Greenwalt [Fri, 2 Dec 2016 03:59:24 +0000 (03:59 +0000)]
Merge "Get the correct operator name" am:
297e9f9a32 am:
2232ac8c59
am:
18a0e81a06
Change-Id: I2eb4c69121e7635c885eca227b1eb3eea13fe13f
Android Build Merger (Role) [Fri, 2 Dec 2016 03:58:50 +0000 (03:58 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection am:
4e22d6dc45 am:
9161228e31" into nyc-mr2-dev-plus-aosp
Christine Hallstrom [Fri, 2 Dec 2016 03:57:13 +0000 (03:57 +0000)]
Add ability to set supported audio routes on phone accounts and connection am:
4e22d6dc45
am:
bad3a2ab2e
Change-Id: Ib162b2de42b636081a07d91a61406858d40e56f3
Christine Hallstrom [Fri, 2 Dec 2016 03:57:07 +0000 (03:57 +0000)]
Add ability to set supported audio routes on phone accounts and connection am:
4e22d6dc45
am:
9161228e31
Change-Id: If9eb6d0d8be1c1e7080726a7b431431d245387a6
Christine Hallstrom [Fri, 2 Dec 2016 03:57:06 +0000 (03:57 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev
am:
fd1f724e7a
Change-Id: I40000727f29126b87625b1930b278e7c630a82a9
Android Build Merger (Role) [Fri, 2 Dec 2016 03:52:16 +0000 (03:52 +0000)]
Merge "Merge "jni: EventLog replace open coding with android_log_event_list" am:
1981812450 am:
de04a0480a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Fri, 2 Dec 2016 03:51:38 +0000 (03:51 +0000)]
Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a" into nyc-mr1-dev-plus-aosp
Mark Salyzyn [Fri, 2 Dec 2016 03:51:36 +0000 (03:51 +0000)]
Merge "jni: EventLog replace open coding with android_log_event_list" am:
1981812450
am:
de04a0480a
Change-Id: I21996e138bd6331b5a5aaa479e33f95f8ec53351
Christine Hallstrom [Fri, 2 Dec 2016 03:50:39 +0000 (03:50 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev
am:
fd1f724e7a
Change-Id: I57ef120cb7bb529f8c7ee0226563a1f8e3272d42
Robert Greenwalt [Fri, 2 Dec 2016 03:50:33 +0000 (03:50 +0000)]
Merge "Get the correct operator name" am:
297e9f9a32
am:
2232ac8c59
Change-Id: I0291098331abacfd48a479d00ef61e52110037c2
Christine Hallstrom [Fri, 2 Dec 2016 03:45:29 +0000 (03:45 +0000)]
Add ability to set supported audio routes on phone accounts and connection
am:
4e22d6dc45
Change-Id: I5144f403e9dcdc7934fa56e045e2f95703af7ad6
Christine Hallstrom [Fri, 2 Dec 2016 03:45:16 +0000 (03:45 +0000)]
Add ability to set supported audio routes on phone accounts and connection
am:
4e22d6dc45
Change-Id: I297896e35044be8affdd4102f223a9b32321a272
Mark Salyzyn [Fri, 2 Dec 2016 03:44:33 +0000 (03:44 +0000)]
Merge "jni: EventLog replace open coding with android_log_event_list"
am:
1981812450
Change-Id: Ia6a4daf5b90ef20d227e06c9322a84ed7d3bb8aa
Robert Greenwalt [Fri, 2 Dec 2016 03:39:30 +0000 (03:39 +0000)]
Merge "Get the correct operator name"
am:
297e9f9a32
Change-Id: Ic4c433e9b7e70427275fbbba785bb365e0ced8d5
Christine Hallstrom [Fri, 2 Dec 2016 03:38:09 +0000 (03:38 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev
Jack He [Thu, 1 Dec 2016 00:28:53 +0000 (16:28 -0800)]
Protect broadcast emitted by Bluetooth mapmce and pbap profile
Bug:
33281228
Test: mm -j 40
Change-Id: I273e9e3c02f431ba7006bcf5d230a6c30eb67843
Android Build Merger (Role) [Fri, 2 Dec 2016 02:52:54 +0000 (02:52 +0000)]
Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am:
73b49fc7e8 am:
8c456f7f39 am:
5902fdad90 am:
f906cf3102 am:
63036e2fec" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:52:09 +0000 (02:52 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am:
73b49fc7e8 am:
8c456f7f39 am:
5902fdad90 am:
f906cf3102
am:
63036e2fec
Change-Id: Idd85e1ca306e5e875cc6aefb8b886d20390f7d1a
Android Build Merger (Role) [Fri, 2 Dec 2016 02:51:47 +0000 (02:51 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
17010dc0d2 am:
bc7aae3610 am:
0d774967ba am:
7b1ae648a4 am:
b5ee31237f" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:50:59 +0000 (02:50 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am:
73b49fc7e8 am:
8c456f7f39 am:
5902fdad90 am:
f906cf3102
am:
0924331760
Change-Id: I211645ebafe7008db3a2b9b09a03a8430e0719e2
Jeff Sharkey [Fri, 2 Dec 2016 02:50:55 +0000 (02:50 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
17010dc0d2 am:
bc7aae3610 am:
0d774967ba am:
7b1ae648a4
am:
b5ee31237f
Change-Id: I603087491b88dc3f84f8f79190e60b3884924cd8
Jeff Sharkey [Fri, 2 Dec 2016 02:45:11 +0000 (02:45 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
17010dc0d2 am:
bc7aae3610 am:
0d774967ba am:
7b1ae648a4
am:
ae231bc2ec
Change-Id: I8ac097042f160862a541ba88bed14e38bff6b311
Jeff Sharkey [Fri, 2 Dec 2016 02:42:18 +0000 (02:42 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am:
73b49fc7e8 am:
8c456f7f39 am:
5902fdad90
am:
f906cf3102
Change-Id: I1ee07eed9799b5f51af5788f0a983cc939a5fe90
Jeff Sharkey [Fri, 2 Dec 2016 02:39:33 +0000 (02:39 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am:
73b49fc7e8 am:
8c456f7f39 am:
5902fdad90
am:
f906cf3102
Change-Id: I2ee7d96ea30b79b06f309fd6c9a0f00be1845110
Jeff Sharkey [Fri, 2 Dec 2016 02:38:28 +0000 (02:38 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
17010dc0d2 am:
bc7aae3610 am:
0d774967ba
am:
7b1ae648a4
Change-Id: Ic41686d29064a35663dedf07d6e016f5f7522758
Jeff Sharkey [Fri, 2 Dec 2016 02:38:24 +0000 (02:38 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
17010dc0d2 am:
bc7aae3610 am:
0d774967ba
am:
7b1ae648a4
Change-Id: I32eb16bd4e678fc7b006056e2383d65f8072685e
Jeff Sharkey [Fri, 2 Dec 2016 02:26:28 +0000 (02:26 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am:
73b49fc7e8 am:
8c456f7f39
am:
5902fdad90
Change-Id: Ia298b5408374d17ac37e6d9e0e9f2b26a637098f
Jeff Sharkey [Fri, 2 Dec 2016 02:25:40 +0000 (02:25 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours am:
704085119d am:
8bd3aa70ad -s ours am:
60cc001b28 am:
a0b41fca40 am:
793c3b14df am:
cfa18212ff -s ours am:
52a98daa1a am:
264f2b50b5 am:
353d59d997 am:
0731a26560
am:
02d2c2025a
Change-Id: I03e80b29e19e0e033eb048eb737367b53335e26b
Jeff Sharkey [Fri, 2 Dec 2016 02:25:28 +0000 (02:25 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
17010dc0d2 am:
bc7aae3610
am:
0d774967ba
Change-Id: Ie4d4800ab930a9ae19ba1f614edd876b79c29faf
Jeff Sharkey [Fri, 2 Dec 2016 02:21:22 +0000 (02:21 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours am:
704085119d am:
8bd3aa70ad -s ours am:
60cc001b28 am:
a0b41fca40 am:
793c3b14df am:
cfa18212ff -s ours am:
52a98daa1a am:
264f2b50b5 am:
353d59d997 am:
0731a26560
am:
72826577f5
Change-Id: Ie43a9f51bf38658d6fa6b26423890328fce32e08
Jeff Sharkey [Fri, 2 Dec 2016 02:19:50 +0000 (02:19 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am:
73b49fc7e8
am:
8c456f7f39
Change-Id: I26ad39aa405aa08fce0b26ef183678d08667ac04
Android Build Merger (Role) [Fri, 2 Dec 2016 02:19:00 +0000 (02:19 +0000)]
Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am:
e49ba8b3d8 am:
0202b4601d am:
697a74cfc5" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:18:58 +0000 (02:18 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
17010dc0d2
am:
bc7aae3610
Change-Id: Ica4ff267ef7078a5351e41c3af08614eb65907f8
Android Build Merger (Role) [Fri, 2 Dec 2016 02:18:24 +0000 (02:18 +0000)]
Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am:
e49ba8b3d8 am:
0202b4601d am:
2e61d93a57" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:18:21 +0000 (02:18 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am:
e49ba8b3d8 am:
0202b4601d
am:
697a74cfc5
Change-Id: I6d12d7c77b7b77fe66bdd8f5af8a14000e013c42
Android Build Merger (Role) [Fri, 2 Dec 2016 02:17:58 +0000 (02:17 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
6eee8e37fd am:
6795459a80 am:
ede3a78432" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:17:41 +0000 (02:17 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am:
e49ba8b3d8 am:
0202b4601d
am:
2e61d93a57
Change-Id: Ia76c5a78bc3ba1a2c63ed7c7dbd040970c7960b7
Android Build Merger (Role) [Fri, 2 Dec 2016 02:17:21 +0000 (02:17 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
6eee8e37fd am:
6795459a80 am:
6dbcefeea6" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:17:17 +0000 (02:17 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
6eee8e37fd am:
6795459a80
am:
ede3a78432
Change-Id: Ia096688611ad3f30d7f32975a84ced573fa5961d
Android Build Merger (Role) [Fri, 2 Dec 2016 02:16:49 +0000 (02:16 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a am:
f2688ddcb7 am:
f5ab66fd9a am:
14226e7b43" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:16:33 +0000 (02:16 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
6eee8e37fd am:
6795459a80
am:
6dbcefeea6
Change-Id: Ic53e9c2543e75978f0b9b6e66c1444b97d1ce4d2
Android Build Merger (Role) [Fri, 2 Dec 2016 02:16:11 +0000 (02:16 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a am:
f2688ddcb7 am:
f5ab66fd9a am:
c437780cfd" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:16:07 +0000 (02:16 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a am:
f2688ddcb7 am:
f5ab66fd9a
am:
14226e7b43
Change-Id: Id222b26a369f3abbd316bd601bf2c622ffc57ebb
Android Build Merger (Role) [Fri, 2 Dec 2016 02:15:32 +0000 (02:15 +0000)]
Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f am:
68979dd543 am:
4529abc0f7 am:
8e41995ee5" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:15:31 +0000 (02:15 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a am:
f2688ddcb7 am:
f5ab66fd9a
am:
c437780cfd
Change-Id: I3749b9be4fbc9a652964be431729898911cf64a0
Android Build Merger (Role) [Fri, 2 Dec 2016 02:15:00 +0000 (02:15 +0000)]
Merge "Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f am:
68979dd543 am:
4529abc0f7 am:
1c0fa9c717" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:14:40 +0000 (02:14 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f am:
68979dd543 am:
4529abc0f7
am:
8e41995ee5
Change-Id: Iea35f07607258e7c2fcac77374746c7a72552649
Jeff Sharkey [Fri, 2 Dec 2016 02:14:17 +0000 (02:14 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f am:
68979dd543 am:
4529abc0f7
am:
1c0fa9c717
Change-Id: I2f5ace2d400c389326c7134d3ddef137030d86b4
Android Build Merger (Role) [Fri, 2 Dec 2016 02:14:08 +0000 (02:14 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d am:
90efb1a88d am:
25a7e0e952 am:
15aa9cb01a" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 2 Dec 2016 02:13:53 +0000 (02:13 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d am:
90efb1a88d am:
25a7e0e952 am:
ee4bc735dc" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:13:20 +0000 (02:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d am:
90efb1a88d am:
25a7e0e952
am:
15aa9cb01a
Change-Id: I3a0af49b510a1678d43b5d4e45ee0e8858adb888
Jeff Sharkey [Fri, 2 Dec 2016 02:13:12 +0000 (02:13 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d am:
90efb1a88d am:
25a7e0e952
am:
ee4bc735dc
Change-Id: I6104cfaa6298fea86b207b7aee223461a7658b34
Android Build Merger (Role) [Fri, 2 Dec 2016 02:12:55 +0000 (02:12 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774 am:
ced9dde8c0 am:
18f2836082 am:
8e1fb24415" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 02:12:09 +0000 (02:12 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours am:
704085119d am:
8bd3aa70ad -s ours am:
60cc001b28 am:
a0b41fca40 am:
793c3b14df am:
cfa18212ff -s ours am:
52a98daa1a am:
264f2b50b5 am:
353d59d997
am:
0731a26560
Change-Id: I6dd01ad47f0005426a3e8017250c3c3105ca042b
Jeff Sharkey [Fri, 2 Dec 2016 02:12:07 +0000 (02:12 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours am:
704085119d am:
8bd3aa70ad -s ours am:
60cc001b28 am:
a0b41fca40 am:
793c3b14df am:
cfa18212ff -s ours am:
52a98daa1a am:
264f2b50b5 am:
353d59d997
am:
0731a26560
Change-Id: I7d2f66a795bc2129d103bc1988f4eb20617326f0
Jeff Sharkey [Fri, 2 Dec 2016 02:12:03 +0000 (02:12 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774 am:
ced9dde8c0 am:
18f2836082
am:
8e1fb24415
Change-Id: Ifcba6b1e741055477ca57e44831c1c4e283f121c
Jeff Sharkey [Fri, 2 Dec 2016 02:12:03 +0000 (02:12 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774 am:
ced9dde8c0 am:
18f2836082
am:
418e3de3cb
Change-Id: Ia842c09a1106d007d1d7a6eb800a9332905f25cd
Jeff Sharkey [Fri, 2 Dec 2016 02:05:46 +0000 (02:05 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am:
e49ba8b3d8
am:
0202b4601d
Change-Id: I8c74be211eb1b7497b630ef53c7812d9156f1863
Jeff Sharkey [Fri, 2 Dec 2016 02:05:37 +0000 (02:05 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev
am:
73b49fc7e8
Change-Id: I65b86aaaec4033f19b3f3560d1c57bf32f1a4d5e
Jeff Sharkey [Fri, 2 Dec 2016 02:05:34 +0000 (02:05 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
17010dc0d2
Change-Id: I7c6d507411864912937c9dbacc985cb834760cfe
Jeff Sharkey [Fri, 2 Dec 2016 02:04:56 +0000 (02:04 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev am:
e49ba8b3d8
am:
0202b4601d
Change-Id: Id7b0f83fe32de6b2eb403663eaa4d82d5c81d958
Jeff Sharkey [Fri, 2 Dec 2016 02:04:40 +0000 (02:04 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
6eee8e37fd
am:
6795459a80
Change-Id: I2ca4cd7315a5e22c0bc53519b3705248ebf924ed
Jeff Sharkey [Fri, 2 Dec 2016 02:03:58 +0000 (02:03 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
6eee8e37fd
am:
6795459a80
Change-Id: I5ca304b89c30c3c7d0bddb701c60c81c87d8870c
Jeff Sharkey [Fri, 2 Dec 2016 02:03:27 +0000 (02:03 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a am:
f2688ddcb7
am:
f5ab66fd9a
Change-Id: Ic3d7068ba87f1859085e70b390a6497d52cc7e8e
Jeff Sharkey [Fri, 2 Dec 2016 02:02:58 +0000 (02:02 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a am:
f2688ddcb7
am:
f5ab66fd9a
Change-Id: I9436de1d1af63c14e63c5e6ef10e36ce8cc23288
Jeff Sharkey [Fri, 2 Dec 2016 02:02:08 +0000 (02:02 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f am:
68979dd543
am:
4529abc0f7
Change-Id: I2f59d1f57871e797c6edb7510b27aba030e51692
Jeff Sharkey [Fri, 2 Dec 2016 02:01:48 +0000 (02:01 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f am:
68979dd543
am:
4529abc0f7
Change-Id: I344a012ddf84b2cdee290ab5c2fb055b50013248
Jeff Sharkey [Fri, 2 Dec 2016 02:00:51 +0000 (02:00 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d am:
90efb1a88d
am:
25a7e0e952
Change-Id: I96fcef9277b247c7543d461116aeaaa5ce402998
Jeff Sharkey [Fri, 2 Dec 2016 02:00:46 +0000 (02:00 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d am:
90efb1a88d
am:
25a7e0e952
Change-Id: Ie15abbf00fd5c64a56a8635c1948146d5ae88be5
Jeff Sharkey [Fri, 2 Dec 2016 01:59:43 +0000 (01:59 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774 am:
ced9dde8c0
am:
18f2836082
Change-Id: I3a350e0b20187e66480bdb03344b46f3b42e3737
Jeff Sharkey [Fri, 2 Dec 2016 01:59:39 +0000 (01:59 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours am:
704085119d am:
8bd3aa70ad -s ours am:
60cc001b28 am:
a0b41fca40 am:
793c3b14df am:
cfa18212ff -s ours am:
52a98daa1a am:
264f2b50b5
am:
353d59d997
Change-Id: Id5f9617fcc3f3a02fbb5fdd47b1fa9c605ec2a3b
Jeff Sharkey [Fri, 2 Dec 2016 01:59:39 +0000 (01:59 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774 am:
ced9dde8c0
am:
18f2836082
Change-Id: Ic89cad34d2c4a1cd8590c89c6c9d1f0a32b149c3
Jeff Sharkey [Fri, 2 Dec 2016 01:53:55 +0000 (01:53 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours am:
704085119d am:
8bd3aa70ad -s ours am:
60cc001b28 am:
a0b41fca40 am:
793c3b14df am:
cfa18212ff -s ours am:
52a98daa1a
am:
264f2b50b5
Change-Id: If9d02088e2853c8959e7beb54a30c92dc3dd61de
Jeff Sharkey [Fri, 2 Dec 2016 01:52:15 +0000 (01:52 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-mr1-dev
am:
e49ba8b3d8
Change-Id: I6e2a50c80c12c9cd88f36a019fa814713f724c82
Jeff Sharkey [Fri, 2 Dec 2016 01:52:12 +0000 (01:52 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing.
am:
6eee8e37fd
Change-Id: I431b334bbf3580f51fc8e31da28c9c9d6f5944ee
TreeHugger Robot [Fri, 2 Dec 2016 01:51:44 +0000 (01:51 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev
Jeff Sharkey [Fri, 2 Dec 2016 01:51:04 +0000 (01:51 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
1de465bec2 am:
b9a0b79675 -s ours am:
1da786d723 am:
af5f47caca am:
ee8e0e8ae3 am:
f70dd1fbc1 -s ours am:
60f17b8505 am:
ca44afff8a
am:
f2688ddcb7
Change-Id: Ibdbf06398dc508b01561b912bdbcb1b419965b4d
Jeff Sharkey [Fri, 2 Dec 2016 01:49:54 +0000 (01:49 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into mnc-dr1.5-dev am:
32d2b4c7af -s ours am:
18ade37c6b am:
05318c125f
am:
68979dd543
Change-Id: I451cba0003a6dbea88d718c332971386c539dad7
Jeff Sharkey [Fri, 2 Dec 2016 01:48:50 +0000 (01:48 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f084ccd48d -s ours am:
d9a7f11334 am:
2436f1e49d
am:
90efb1a88d
Change-Id: I7dd6a4396691429ba66cefb136c6176db62da010
Jeff Sharkey [Fri, 2 Dec 2016 01:47:50 +0000 (01:47 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
f279a5bc0d -s ours am:
704085119d am:
8bd3aa70ad -s ours am:
60cc001b28 am:
a0b41fca40 am:
793c3b14df am:
cfa18212ff -s ours
am:
52a98daa1a
Change-Id: I26fab4fb01b88370f84c1767c79998ebc503d731
Jeff Sharkey [Fri, 2 Dec 2016 01:47:45 +0000 (01:47 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
fbf395c220 am:
2d549764be am:
b981c3be70 -s ours am:
a24a33490a am:
dd32a67b33 am:
a898d9f6ca am:
94a2dd9354
am:
536575523e
Change-Id: I2578d998946a09f348b4aafec751a3f633d97c37
Jeff Sharkey [Fri, 2 Dec 2016 01:47:37 +0000 (01:47 +0000)]
DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am:
3b0aa060a3 am:
3e0d93036b am:
061e7313b4 am:
50102e63da -s ours am:
e94d76436b am:
40b4b1f774
am:
ced9dde8c0
Change-Id: I00217abf1fb1f9f772547250d24dc30ea78c6683
OSDN Git Service
