OSDN Git Service
Jeff Sharkey [Fri, 2 Dec 2016 19:54:38 +0000 (19:54 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours am:
aeeb9c8470 am:
8c74832d5e am:
07ad2a9063 am:
a75ce3a705
am:
0ae6bb63ea
Change-Id: I54329c81374eff14c24984bfa606e53e67e64355
Jeff Sharkey [Fri, 2 Dec 2016 19:53:00 +0000 (19:53 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb am:
8165a22f53 am:
270d1c27ac am:
10cdb1130e" into nyc-mr1-dev-plus-aosp
am:
fb9a16a3f3
Change-Id: I3a8f1049cb6cbf2b2885943fbea7dba31364234a
Jeff Sharkey [Fri, 2 Dec 2016 19:52:56 +0000 (19:52 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb am:
8165a22f53 am:
270d1c27ac am:
10cdb1130e
am:
45ba8593c0
Change-Id: I2040801dcb090ea635e5840232130d69ee14aef8
Jaekyun Seok [Fri, 2 Dec 2016 19:51:59 +0000 (19:51 +0000)]
Merge "Remove static link in Android framework under /frameworks/base." am:
c60963e451 am:
5705ad69db
am:
ae21f6f5b0
Change-Id: Ie0306a1e3dc80f6ee6ad9669b91d150167b04586
Jeff Sharkey [Fri, 2 Dec 2016 19:44:41 +0000 (19:44 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours am:
aeeb9c8470 am:
8c74832d5e am:
07ad2a9063
am:
a75ce3a705
Change-Id: I58024db3b95f3650d24b0cb3daea13fe91a8a49e
Android Build Merger (Role) [Fri, 2 Dec 2016 19:44:20 +0000 (19:44 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb am:
8165a22f53 am:
270d1c27ac am:
10cdb1130e" into nyc-mr1-dev-plus-aosp
Jaekyun Seok [Fri, 2 Dec 2016 19:43:36 +0000 (19:43 +0000)]
Merge "Remove static link in Android framework under /frameworks/base." am:
c60963e451
am:
5705ad69db
Change-Id: I3f2c38332115a7b52b893629f2a5007d75c2831d
Jeff Sharkey [Fri, 2 Dec 2016 19:43:34 +0000 (19:43 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb am:
8165a22f53 am:
270d1c27ac
am:
10cdb1130e
Change-Id: I8ad049d8577a5bcc1fac76b0644a90b4b4f495aa
Jaekyun Seok [Fri, 2 Dec 2016 19:35:03 +0000 (19:35 +0000)]
Merge "Remove static link in Android framework under /frameworks/base."
am:
c60963e451
Change-Id: I0bbb3cf9a66752f6ee8218a4ac5545091130bbed
Jeff Sharkey [Fri, 2 Dec 2016 19:27:26 +0000 (19:27 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours am:
aeeb9c8470 am:
8c74832d5e
am:
07ad2a9063
Change-Id: Ia05929a5edcc75490d8388008380d5db8f7edc85
Jeff Sharkey [Fri, 2 Dec 2016 19:26:31 +0000 (19:26 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb am:
8165a22f53
am:
270d1c27ac
Change-Id: I426e531fd2fda1e09276dcfdc774fb548eedbefd
Treehugger Robot [Fri, 2 Dec 2016 19:21:46 +0000 (19:21 +0000)]
Merge "Remove static link in Android framework under /frameworks/base."
Jeff Sharkey [Fri, 2 Dec 2016 19:19:29 +0000 (19:19 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours am:
aeeb9c8470
am:
8c74832d5e
Change-Id: I35d8c2faba5a6f359bbe51b56052bafe90a6cac1
Jeff Sharkey [Fri, 2 Dec 2016 19:18:31 +0000 (19:18 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours am:
e0fe3201cb
am:
8165a22f53
Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b
Jeff Sharkey [Fri, 2 Dec 2016 19:15:22 +0000 (19:15 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am:
0be332852e -s ours am:
b685f719f1 am:
45b6a52225 am:
34b87d94e4 am:
30ef1ad5be
am:
5fafe8ea7c
Change-Id: Ia622d8d4b4397979bf69a2ef78e59bc0b6083e9a
Jeff Sharkey [Fri, 2 Dec 2016 19:14:14 +0000 (19:14 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
956bc433dc -s ours am:
3f0e7465cb am:
b88d8dc58f am:
b4638e2d88 am:
bf9a60106b
am:
4d80f89b19
Change-Id: Ia8296466ffa048e8ada727f7015e74925d6098a3
Jeff Sharkey [Fri, 2 Dec 2016 19:09:26 +0000 (19:09 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am:
0be332852e -s ours am:
b685f719f1 am:
45b6a52225 am:
34b87d94e4 am:
30ef1ad5be
am:
652521ae7b
Change-Id: I1b27ce8b97733188112331f969c72ca35e3bff56
Jeff Sharkey [Fri, 2 Dec 2016 19:08:38 +0000 (19:08 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
956bc433dc -s ours am:
3f0e7465cb am:
b88d8dc58f am:
b4638e2d88 am:
bf9a60106b
am:
1afc4b8425
Change-Id: I7b752d76de85f13b0575972271bdca062f86e4d9
Android Build Merger (Role) [Fri, 2 Dec 2016 19:04:26 +0000 (19:04 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am:
fdef2cd87d am:
414334595e am:
26e6918800 am:
ef5d241938 am:
48313052ab" into nyc-mr2-dev-plus-aosp
Android Build Merger (Role) [Fri, 2 Dec 2016 19:04:18 +0000 (19:04 +0000)]
Merge "Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am:
fdef2cd87d am:
414334595e am:
26e6918800 am:
ef5d241938 am:
29c335ef2e" into nyc-mr2-dev-plus-aosp
Jeff Sharkey [Fri, 2 Dec 2016 19:04:02 +0000 (19:04 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am:
0be332852e -s ours am:
b685f719f1 am:
45b6a52225 am:
34b87d94e4
am:
30ef1ad5be
Change-Id: I18a8e1de1557e15c289974240419abc59147facd
Jeff Sharkey [Fri, 2 Dec 2016 19:03:45 +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:
48313052ab
Change-Id: Iea845fe3a9ce30f8e7e36f447a8f8d1925e426b8
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
Jeff Sharkey [Fri, 2 Dec 2016 19:03:36 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04 am:
4610805746 -s ours
am:
aeeb9c8470
Change-Id: I886018e68c75bb833d0a18c76f6db557b1b9c9e8
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:03:28 +0000 (19:03 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am:
0be332852e -s ours am:
b685f719f1 am:
45b6a52225 am:
34b87d94e4
am:
30ef1ad5be
Change-Id: I2b58aa2e0123c5ab4e8c4fd81511984def099248
Jeff Sharkey [Fri, 2 Dec 2016 19:02:36 +0000 (19:02 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a am:
a07bcbcc27 -s ours
am:
e0fe3201cb
Change-Id: Ifbfd912aac170923e5aea43e3b5ba9cfe135cea5
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:34 +0000 (19:02 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
956bc433dc -s ours am:
3f0e7465cb am:
b88d8dc58f am:
b4638e2d88
am:
bf9a60106b
Change-Id: I8c9cb10bfc49c49fe51512dbc9242c94820d474e
Jeff Sharkey [Fri, 2 Dec 2016 19:02:33 +0000 (19:02 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
956bc433dc -s ours am:
3f0e7465cb am:
b88d8dc58f am:
b4638e2d88
am:
bf9a60106b
Change-Id: I1dde05de5e0a04396d964c5a2f6aab82f021fd4c
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
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
Jeff Sharkey [Fri, 2 Dec 2016 18:55:14 +0000 (18:55 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am:
fdef2cd87d am:
414334595e am:
26e6918800
am:
ef5d241938
Change-Id: I87f7ada782341c052d923fcd0798f58adc1942e2
Jeff Sharkey [Fri, 2 Dec 2016 18:55:04 +0000 (18:55 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am:
0be332852e -s ours am:
b685f719f1 am:
45b6a52225
am:
34b87d94e4
Change-Id: Ibe93903e3be3f8a6581fc0a3acdc6482542f3204
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:58 +0000 (18:53 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
956bc433dc -s ours am:
3f0e7465cb am:
b88d8dc58f
am:
b4638e2d88
Change-Id: Iefbb713e624ec639205d51f560045a0cb5cf3dbc
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:47:08 +0000 (18:47 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4 am:
471812ad04
am:
4610805746 -s ours
Change-Id: If9504039b5ec449edb2fb1e9f429a3d568a2aabf
Jeff Sharkey [Fri, 2 Dec 2016 18:46:35 +0000 (18:46 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am:
0be332852e -s ours am:
b685f719f1
am:
45b6a52225
Change-Id: Ie06f966f3b526c56de139a81edc7d8ccd5be074c
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: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:45:38 +0000 (18:45 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd am:
7340749c2a
am:
a07bcbcc27 -s ours
Change-Id: I9d320f3e2c77712757c17f1609c62c325cca9082
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:45:30 +0000 (18:45 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
956bc433dc -s ours am:
3f0e7465cb
am:
b88d8dc58f
Change-Id: I9587d5abd8d0525e3b098a5f9662e5edbc1f9c12
Jeff Sharkey [Fri, 2 Dec 2016 18:38:22 +0000 (18:38 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am:
0be332852e -s ours
am:
b685f719f1
Change-Id: If5744f0e5554877450b5e75f304fe857366de72c
Jeff Sharkey [Fri, 2 Dec 2016 18:37:58 +0000 (18:37 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am:
48f6bdfce4
am:
471812ad04
Change-Id: Ida67c1a00ac95109c647eb182af7628544bbb739
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:43 +0000 (18:36 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
956bc433dc -s ours
am:
3f0e7465cb
Change-Id: Iaa85b6d22c436ff2c46eafe500a74448403c5886
Jeff Sharkey [Fri, 2 Dec 2016 18:36:40 +0000 (18:36 +0000)]
DO NOT MERGE: Check provider access for content changes. am:
ff2fede0dd
am:
7340749c2a
Change-Id: Iabb21a28a245d36f2247eaace573bdfd134f382d
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:10 +0000 (18:20 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev
am:
0be332852e -s ours
Change-Id: Ia1266b2276eb2219fbd19aff20985d278bd58fac
Jeff Sharkey [Fri, 2 Dec 2016 18:20:06 +0000 (18:20 +0000)]
DO NOT MERGE: Check provider access for content changes.
am:
956bc433dc -s ours
Change-Id: I36a6cf33803635becf8ff794bb8f4e02ba5cd1d4
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:19:45 +0000 (18:19 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev
am:
48f6bdfce4
Change-Id: I70a8437a6d5c4b3ed69833a635aa8501ca26a41e
Jeff Sharkey [Fri, 2 Dec 2016 18:19:42 +0000 (18:19 +0000)]
DO NOT MERGE: Check provider access for content changes.
am:
ff2fede0dd
Change-Id: I7de766d1acc1f20e83f07953dedfe3810f906db8
Jeff Sharkey [Fri, 2 Dec 2016 18:10:03 +0000 (18:10 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev
Jeff Sharkey [Fri, 2 Dec 2016 18:10:02 +0000 (18:10 +0000)]
Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev
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: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
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."
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
OSDN Git Service
