OSDN Git Service
Jeff Sharkey [Fri, 2 Dec 2016 19:16:00 +0000 (19:16 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am:
fdef2cd87d am:
414334595e am:
26e6918800 am:
ef5d241938 am:
29c335ef2e
am:
01f9f1bec2 -s ours
Change-Id: I2cb165fab892f3206fbdf03a14796ea721c2a2a8
Jeff Sharkey [Fri, 2 Dec 2016 19:14:18 +0000 (19:14 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b am:
ad04786a3d am:
9e7bd59457 am:
94b6048c4a" into nyc-mr2-dev-plus-aosp
am:
d949aa9afe -s ours
Change-Id: I5c271fd23c03564165faf10d0d7499ef62325d34
Jeff Sharkey [Fri, 2 Dec 2016 19:14:10 +0000 (19:14 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b am:
ad04786a3d am:
9e7bd59457 am:
94b6048c4a
am:
8d9cb505d5 -s ours
Change-Id: I39803911a8f10f0c73a93473d3b9dc67ca185065
Jeff Sharkey [Fri, 2 Dec 2016 19:12:50 +0000 (19:12 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b am:
ad04786a3d am:
9e7bd59457 am:
0040d4f71c
am:
906cec27c2 -s ours
Change-Id: I46ccdd4afba9b3138397a8536d753e2819d94995
Jeff Sharkey [Fri, 2 Dec 2016 19:03:40 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am:
fdef2cd87d am:
414334595e am:
26e6918800 am:
ef5d241938
am:
29c335ef2e
Change-Id: Iaa2e76ad70e68ea1457604b274b35a0978b34bff
Android Build Merger (Role) [Fri, 2 Dec 2016 19:03:30 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b am:
ad04786a3d am:
9e7bd59457 am:
94b6048c4a" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 19:02:35 +0000 (19:02 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b am:
ad04786a3d am:
9e7bd59457
am:
94b6048c4a
Change-Id: I47554fd58875360e09418af17029deb1aff0274a
Jeff Sharkey [Fri, 2 Dec 2016 19:02:33 +0000 (19:02 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b am:
ad04786a3d am:
9e7bd59457
am:
0040d4f71c
Change-Id: I3ba82865bee69b527ebeb9bcfdd2b9883925a5ca
Fyodor Kupolov [Fri, 2 Dec 2016 19:02:27 +0000 (19:02 +0000)]
Merge "Test permission grants for all privapps"
Jeff Sharkey [Fri, 2 Dec 2016 19:01:32 +0000 (19:01 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am:
5ec25934ce am:
21d36dcc91 am:
26450476b8
am:
d7e0fab45c -s ours
Change-Id: Ibaa14fb3ee89c5ca61e603c9edad5b11ddd0d2a8
Jeff Sharkey [Fri, 2 Dec 2016 19:00:35 +0000 (19:00 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
c813f5dae2 am:
2b7584f5b1 am:
d8ee1d0fcd
am:
b155106933 -s ours
Change-Id: I128c5baee4f0f4d754467f4f718c5d55c0bc7020
Android Build Merger (Role) [Fri, 2 Dec 2016 18:55:35 +0000 (18:55 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am:
5ec25934ce am:
21d36dcc91 am:
ff703a3fd0 am:
dc4cbfa1df -s ours"
Jeff Sharkey [Fri, 2 Dec 2016 18:55:20 +0000 (18:55 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am:
5ec25934ce am:
21d36dcc91
am:
26450476b8
Change-Id: I7904c300b0edb08ae4371472c8ea8df8be269e2e
Hridya Valsaraju [Fri, 2 Dec 2016 18:54:59 +0000 (18:54 +0000)]
Merge "Modify GnssLocationProvider to use Treble Gnss HAL"
Jeff Sharkey [Fri, 2 Dec 2016 18:54:58 +0000 (18:54 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am:
5ec25934ce am:
21d36dcc91 am:
ff703a3fd0
am:
dc4cbfa1df -s ours
Change-Id: I90cec2b594652f98a5c4a2a1b042344efb00b744
Jeff Sharkey [Fri, 2 Dec 2016 18:54:52 +0000 (18:54 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am:
fdef2cd87d am:
414334595e am:
26e6918800
am:
ef5d241938
Change-Id: I0dc6e8b142d2f4576212281f372a8917efd2e1f4
Jeff Sharkey [Fri, 2 Dec 2016 18:54:16 +0000 (18:54 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
c813f5dae2 am:
2b7584f5b1
am:
d8ee1d0fcd
Change-Id: Ie8a8213307f8f85b00f2232cf047a8d8563bd859
Jeff Sharkey [Fri, 2 Dec 2016 18:53:57 +0000 (18:53 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b am:
ad04786a3d
am:
9e7bd59457
Change-Id: Ia76c61296501cede3473ac743583643135820ad4
Jeff Sharkey [Fri, 2 Dec 2016 18:53:56 +0000 (18:53 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b am:
ad04786a3d
am:
9e7bd59457
Change-Id: I83f64b1e31c1d598a1db53af45cbf2563b3eae57
Jeff Sharkey [Fri, 2 Dec 2016 18:53:55 +0000 (18:53 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
c813f5dae2 am:
2b7584f5b1 am:
37d3eecbac
am:
1fb6b55178 -s ours
Change-Id: If4048fee4befc1073db9a195dc0d7795b0272bee
Jeff Sharkey [Fri, 2 Dec 2016 18:46:35 +0000 (18:46 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am:
5ec25934ce am:
21d36dcc91
am:
ff703a3fd0
Change-Id: Ie3a7b042909fcbb0f02d7acc590d431729e5cc31
Jeff Sharkey [Fri, 2 Dec 2016 18:46:35 +0000 (18:46 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am:
fdef2cd87d am:
414334595e
am:
26e6918800
Change-Id: I8b1bf2889bface1c6d8aad7c92b55c301059d6f5
Jeff Sharkey [Fri, 2 Dec 2016 18:45:38 +0000 (18:45 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9 am:
bdfb26ac3b
am:
ad04786a3d
Change-Id: I7272c2bab70ff8b6efd44c35f0131e57f6603748
Jeff Sharkey [Fri, 2 Dec 2016 18:45:31 +0000 (18:45 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
c813f5dae2 am:
2b7584f5b1
am:
37d3eecbac
Change-Id: Ia5c4ff4a6c26aa90d2fa754a73de44b4694cd569
Jeff Sharkey [Fri, 2 Dec 2016 18:37:51 +0000 (18:37 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am:
5ec25934ce
am:
21d36dcc91
Change-Id: I59845d27d897e3c7e8e4c82b01cab6bc1fbf70bf
Jeff Sharkey [Fri, 2 Dec 2016 18:37:43 +0000 (18:37 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am:
fdef2cd87d
am:
414334595e
Change-Id: I8af2c8895deb6abc89c7394809b3e2f24c41fa65
Jeff Sharkey [Fri, 2 Dec 2016 18:37:40 +0000 (18:37 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am:
5ec25934ce
am:
21d36dcc91
Change-Id: Ib2a788b0ebb819ca7b51a668ee9a746fd6c02767
Jeff Sharkey [Fri, 2 Dec 2016 18:36:38 +0000 (18:36 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
c813f5dae2
am:
2b7584f5b1
Change-Id: I762e09539e99d1cb8b6fd810992b27255774060d
Jeff Sharkey [Fri, 2 Dec 2016 18:36:36 +0000 (18:36 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
c813f5dae2
am:
2b7584f5b1
Change-Id: I1a74f306a4d9858a4e9726cd53ab544d28542522
Jeff Sharkey [Fri, 2 Dec 2016 18:36:34 +0000 (18:36 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
11e3e52bd9
am:
bdfb26ac3b
Change-Id: I93ab9555383689078ae6c08534619e8f38a47aaf
Jeff Sharkey [Fri, 2 Dec 2016 18:20:02 +0000 (18:20 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev
am:
fdef2cd87d
Change-Id: Ie6f22b55f9bb934f93d7821e362163bbdbc71753
Jeff Sharkey [Fri, 2 Dec 2016 18:19:51 +0000 (18:19 +0000)]
DO NOT MERGE: Check provider access for content changes.
am:
11e3e52bd9
Change-Id: Ice374d398888e2898f571cee7df73f5e47921655
Jeff Sharkey [Fri, 2 Dec 2016 18:19:49 +0000 (18:19 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev
am:
5ec25934ce
Change-Id: I9608c14a117ab76bd08fa0a9b4d59b62ae1a28f5
Jeff Sharkey [Fri, 2 Dec 2016 18:19:46 +0000 (18:19 +0000)]
DO NOT MERGE: Check provider access for content changes.
am:
c813f5dae2
Change-Id: I939bca8887198e2578916356d49b0f2f0a2bf3d2
Jeff Sharkey [Fri, 2 Dec 2016 18:10:00 +0000 (18:10 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev
Jeff Sharkey [Fri, 2 Dec 2016 18:09:59 +0000 (18:09 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev
Robert Sesek [Fri, 2 Dec 2016 17:43:56 +0000 (17:43 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am:
eda1af611f am:
bbcd9d26b1 am:
5806963539
am:
5c44250176
Change-Id: Ia1a819697d7144073f824a98dd8a315eb60c779b
Robert Sesek [Fri, 2 Dec 2016 17:36:21 +0000 (17:36 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am:
eda1af611f am:
bbcd9d26b1
am:
5806963539
Change-Id: Ic0e53ed482fb27dfab2bb8de52bfe8947beae866
Jean-Michel Trivi [Fri, 2 Dec 2016 17:33:47 +0000 (17:33 +0000)]
Merge "Stream types are for volume control"
Robert Sesek [Fri, 2 Dec 2016 17:21:27 +0000 (17:21 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote." am:
eda1af611f
am:
bbcd9d26b1
Change-Id: I7b7fbf2cc65712bd748a577c2eee1c0a1e35efee
Robert Sesek [Fri, 2 Dec 2016 17:15:23 +0000 (17:15 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
am:
eda1af611f
Change-Id: I539fb728175c109a93cbff7d8929b584e88bb70c
Treehugger Robot [Fri, 2 Dec 2016 17:02:31 +0000 (17:02 +0000)]
Merge "Add new hostingType for startProcessLocked() that selects using the WebViewZygote."
Makoto Onuki [Fri, 2 Dec 2016 16:34:55 +0000 (16:34 +0000)]
Merge "ShortcutManager: Floating shortcuts shouldn't have target activities."
Charles He [Fri, 2 Dec 2016 14:01:57 +0000 (14:01 +0000)]
Merge "Remove IPersistentDataBlockService from system-api."
Michal Karpinski [Fri, 2 Dec 2016 12:02:31 +0000 (12:02 +0000)]
Merge "DO NOT MERGE Rename the DnsEventListenerService to NetdEventListenerService" into nyc-mr2-dev am:
3db0a14ab0
am:
9b44cc929f -s ours
Change-Id: I92bbf99d5fcb12c5b755a80c51a03bee0238aaa1
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:56:00 +0000 (11:56 +0000)]
resolve merge conflicts of
7f9014b to nyc-mr2-dev-plus-aosp
am:
0467529c85
Change-Id: Icb1db24d5e8727efba92badd310095ff803111af
Jorim Jaggi [Fri, 2 Dec 2016 11:46:22 +0000 (11:46 +0000)]
Merge "Don't prepare transition if token is not visible"
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:17:12 +0000 (05:17 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile" am:
7dd909684f am:
33f0cf1267 am:
7ef7e18636
am:
133de5dce0
Change-Id: Id4015a6ff7bfc492181c9e81feadfa66580fbf40
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
Jordan Liu [Fri, 2 Dec 2016 04:46:33 +0000 (04:46 +0000)]
Merge "Rename key declaration to start with "KEY""
Treehugger Robot [Fri, 2 Dec 2016 04:37:47 +0000 (04:37 +0000)]
Merge "Protect broadcast emitted by Bluetooth mapmce and pbap profile"
Mark Salyzyn [Fri, 2 Dec 2016 04:20:52 +0000 (04:20 +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
am:
589c9a3fca
Change-Id: Id31b71cfe62b36c741e091c9227c15486b25a5ac
Mark Salyzyn [Fri, 2 Dec 2016 04:20:44 +0000 (04:20 +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
am:
dc13cff108
Change-Id: I9c778ee9e042e44fd3b85aaf3c8ca80576188f0a
Christine Hallstrom [Fri, 2 Dec 2016 04:19:09 +0000 (04:19 +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
am:
da0b45e8e5
Change-Id: Idc325f66f9c2251bbdbe5260853d25c157c8d610
Christine Hallstrom [Fri, 2 Dec 2016 04:18:59 +0000 (04:18 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a am:
e9e77f2603
am:
29059b46e6
Change-Id: I0883125e3f79eb1869b7dd4f47ac69a671dc676a
Mark Salyzyn [Fri, 2 Dec 2016 04:17:15 +0000 (04:17 +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
am:
7513beb97f
Change-Id: Ifbb1d18dbe623147bea71aa91caea299dab6d7bd
Mark Salyzyn [Fri, 2 Dec 2016 04:17:09 +0000 (04:17 +0000)]
Merge "jni: EventLog replace open coding with android_log_event_list" am:
1981812450 am:
de04a0480a am:
0fbd9b7773
am:
10585f5c86
Change-Id: I596563bed32c17229213af2b92d6bc03d6073d4c
Christine Hallstrom [Fri, 2 Dec 2016 04:15:32 +0000 (04:15 +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
am:
afd2e89fc4
Change-Id: Ie8dca67612016e4583bad7b84cf784fa5ab49cb7
Christine Hallstrom [Fri, 2 Dec 2016 04:15:24 +0000 (04:15 +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
am:
599697dcfd
Change-Id: Ief97b2f234b20d2dbbaff1d4f745ef40d5b81180
Christine Hallstrom [Fri, 2 Dec 2016 04:13:40 +0000 (04:13 +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
am:
31a1a8e559
Change-Id: I68a116d6c16c67dbd74034e210d51d5de22dc999
Christine Hallstrom [Fri, 2 Dec 2016 04:13:31 +0000 (04:13 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am:
fd1f724e7a am:
5599fb3795
am:
40b42d7925
Change-Id: Ia3e6745a1c0c58f53df3421c725681de4fab29e6
Robert Greenwalt [Fri, 2 Dec 2016 04:09:47 +0000 (04:09 +0000)]
Merge "Merge "Get the correct operator name" am:
297e9f9a32 am:
2232ac8c59 am:
18a0e81a06" into nyc-mr2-dev-plus-aosp
am:
c8cdab674d
Change-Id: Ib9f015023960c584c3b09dfbf68454f358660671
Robert Greenwalt [Fri, 2 Dec 2016 04:09:38 +0000 (04:09 +0000)]
Merge "Get the correct operator name" am:
297e9f9a32 am:
2232ac8c59 am:
18a0e81a06
am:
2f31f105e6
Change-Id: Ibc4d546a7903212444985e256361ec6d870b3684
Christine Hallstrom [Fri, 2 Dec 2016 04:07:25 +0000 (04:07 +0000)]
Merge "Add ability to set supported audio routes on phone accounts and connection am:
4e22d6dc45 am:
9161228e31" into nyc-mr2-dev-plus-aosp
am:
c027c8dba8
Change-Id: I673d1ea6063ae546215e8904e0c41f3760473f49
Christine Hallstrom [Fri, 2 Dec 2016 04:06:19 +0000 (04:06 +0000)]
Add ability to set supported audio routes on phone accounts and connection am:
4e22d6dc45 am:
9161228e31
am:
a30ef94b07
Change-Id: I353e8b542a8250b717fe38b84b622e2e968f2e7e
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
Christine Hallstrom [Fri, 2 Dec 2016 04:03:55 +0000 (04:03 +0000)]
Add ability to set supported audio routes on phone accounts and connection am:
4e22d6dc45 am:
bad3a2ab2e
am:
22de17247b
Change-Id: Ib2eab7f6bc9105977b586366b5bd46097e1aca1c
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
Jeff Sharkey [Fri, 2 Dec 2016 03:00:16 +0000 (03:00 +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
am:
a546f6ff50 -s ours
Change-Id: I3f2c5d501c0a773f60a01aa5328b481eaeff0bdb
Jeff Sharkey [Fri, 2 Dec 2016 03:00:10 +0000 (03:00 +0000)]
Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing." into nyc-dev am:
73b49fc7e8 am:
8c456f7f39 am:
5902fdad90 am:
f906cf3102 am:
63036e2fec
am:
5b6fde8c0b -s ours
Change-Id: Id82f8577d3ed25b1e0805082b843fcba71947388
Jeff Sharkey [Fri, 2 Dec 2016 02:58:18 +0000 (02:58 +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
am:
f5163cec88 -s ours
Change-Id: I5867c5e05d38f8af6f615ae613ddb1ef4ab0b939
OSDN Git Service
