Commit Graph

257267 Commits

Author SHA1 Message Date
Jeff Sharkey
f196c044f3 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929 am: f00515f4d9
am: 5bf382063d

Change-Id: Ibef588aa9d1b61c31bb2c0ecfada658ed2574981
2016-12-02 19:46:22 +00:00
Jeff Sharkey
d01f22d0b2 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad am: 12b2f8a275
am: 71e4281969

Change-Id: I61d48d60faa4b8a7e06a72df277f5f2a5180de92
2016-12-02 19:45:19 +00:00
Jeff Sharkey
b46e9bb9cb 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: Ic4004d4923cc544a4babc457bc5cdb024bc9ee51
2016-12-02 19:44:25 +00:00
Jeff Sharkey
dd09c12a61 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: Idfe644ae174419c698987de336e072208468866f
2016-12-02 19:43:28 +00:00
Jeff Sharkey
5bf382063d Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1 am: 398cdb6929
am: f00515f4d9

Change-Id: Iafa9dd90fe36a10d781d92d236faa671178b2737
2016-12-02 19:29:14 +00:00
Jeff Sharkey
71e4281969 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba am: 0891ca2fad
am: 12b2f8a275

Change-Id: I5d2e9c9faa81ddc2c1f29d10aaa8ef7567209969
2016-12-02 19:28:14 +00:00
Jeff Sharkey
a75ce3a705 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
2016-12-02 19:27:26 +00:00
Jeff Sharkey
10cdb1130e 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
2016-12-02 19:26:31 +00:00
Jeff Sharkey
f00515f4d9 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours am: 99b97e5ed1
am: 398cdb6929

Change-Id: I40a0cb7f416d843b12893656d16dfed97d0df058
2016-12-02 19:21:21 +00:00
Jeff Sharkey
12b2f8a275 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours am: c067e76bba
am: 0891ca2fad

Change-Id: I2e9897c052ee296d68beb50b6ac927e5a0d92daa
2016-12-02 19:20:23 +00:00
Jeff Sharkey
07ad2a9063 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
2016-12-02 19:19:29 +00:00
Jeff Sharkey
270d1c27ac DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours am: e0fe3201cb
am: 8165a22f53

Change-Id: Iee87f3c3d384bf785b3c6c877a817c35bbdb478b
2016-12-02 19:18:31 +00:00
Jeff Sharkey
398cdb6929 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b am: 26f78f5836 -s ours
am: 99b97e5ed1

Change-Id: I1812de0dd036142fae97145361fdf5da50e61536
2016-12-02 19:12:00 +00:00
Jeff Sharkey
0891ca2fad DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0 am: 4ad177829a -s ours
am: c067e76bba

Change-Id: I36e17906c43408126d1acabde89bf7ec04e16aab
2016-12-02 19:10:36 +00:00
Jeff Sharkey
99b97e5ed1 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2 am: 44e8914f8b
am: 26f78f5836  -s ours

Change-Id: I6521af4ca816ed3b03e6954159276971a55d349c
2016-12-02 19:03:40 +00:00
Jeff Sharkey
8c74832d5e 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
2016-12-02 19:03:36 +00:00
Jeff Sharkey
5fafe8ea7c 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
2016-12-02 19:03:28 +00:00
Jeff Sharkey
c067e76bba DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5 am: 74b36307a0
am: 4ad177829a  -s ours

Change-Id: I946f7bab2f86d26c23460cc5664d901f4f8fff06
2016-12-02 19:02:42 +00:00
Jeff Sharkey
8165a22f53 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a am: a07bcbcc27 -s ours
am: e0fe3201cb

Change-Id: Ifbfd912aac170923e5aea43e3b5ba9cfe135cea5
2016-12-02 19:02:36 +00:00
Jeff Sharkey
4d80f89b19 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f am: b4638e2d88
am: bf9a60106b

Change-Id: I1dde05de5e0a04396d964c5a2f6aab82f021fd4c
2016-12-02 19:02:33 +00:00
Jeff Sharkey
30ef1ad5be 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
2016-12-02 18:55:04 +00:00
Jeff Sharkey
26f78f5836 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209 am: a80cbeeee2
am: 44e8914f8b

Change-Id: I81d83d40d322bd6cfa2a6b74286cdfa425a2f951
2016-12-02 18:54:57 +00:00
Jeff Sharkey
29c335ef2e Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e am: 26e6918800
am: ef5d241938

Change-Id: I0dc6e8b142d2f4576212281f372a8917efd2e1f4
2016-12-02 18:54:52 +00:00
Jeff Sharkey
4ad177829a DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0 am: 190e20c2b5
am: 74b36307a0

Change-Id: I6e5a7fbc4dfe0f207f6787ef5fbba93b0296e1b1
2016-12-02 18:53:58 +00:00
Jeff Sharkey
bf9a60106b DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb am: b88d8dc58f
am: b4638e2d88

Change-Id: Iefbb713e624ec639205d51f560045a0cb5cf3dbc
2016-12-02 18:53:58 +00:00
Jeff Sharkey
0040d4f71c DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b am: ad04786a3d
am: 9e7bd59457

Change-Id: I83f64b1e31c1d598a1db53af45cbf2563b3eae57
2016-12-02 18:53:56 +00:00
Jeff Sharkey
aeeb9c8470 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
2016-12-02 18:47:08 +00:00
Jeff Sharkey
34b87d94e4 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
2016-12-02 18:46:35 +00:00
Jeff Sharkey
ef5d241938 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d am: 414334595e
am: 26e6918800

Change-Id: I8b1bf2889bface1c6d8aad7c92b55c301059d6f5
2016-12-02 18:46:35 +00:00
Jeff Sharkey
e0fe3201cb DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd am: 7340749c2a
am: a07bcbcc27  -s ours

Change-Id: I9d320f3e2c77712757c17f1609c62c325cca9082
2016-12-02 18:45:38 +00:00
Jeff Sharkey
9e7bd59457 DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9 am: bdfb26ac3b
am: ad04786a3d

Change-Id: I7272c2bab70ff8b6efd44c35f0131e57f6603748
2016-12-02 18:45:38 +00:00
Jeff Sharkey
b4638e2d88 DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours am: 3f0e7465cb
am: b88d8dc58f

Change-Id: I9587d5abd8d0525e3b098a5f9662e5edbc1f9c12
2016-12-02 18:45:30 +00:00
Jeff Sharkey
45b6a52225 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev am: 0be332852e -s ours
am: b685f719f1

Change-Id: If5744f0e5554877450b5e75f304fe857366de72c
2016-12-02 18:38:22 +00:00
Jeff Sharkey
4610805746 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr-dev am: 48f6bdfce4
am: 471812ad04

Change-Id: Ida67c1a00ac95109c647eb182af7628544bbb739
2016-12-02 18:37:58 +00:00
Jeff Sharkey
44e8914f8b Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev am: 8e14278209
am: a80cbeeee2

Change-Id: I6b67d2f65208559d9cb5cd79bfec5fbc506abcad
2016-12-02 18:37:57 +00:00
Jeff Sharkey
26450476b8 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev am: 5ec25934ce
am: 21d36dcc91

Change-Id: I59845d27d897e3c7e8e4c82b01cab6bc1fbf70bf
2016-12-02 18:37:51 +00:00
Jeff Sharkey
26e6918800 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev am: fdef2cd87d
am: 414334595e

Change-Id: I8af2c8895deb6abc89c7394809b3e2f24c41fa65
2016-12-02 18:37:43 +00:00
Jeff Sharkey
b88d8dc58f DO NOT MERGE: Check provider access for content changes. am: 956bc433dc -s ours
am: 3f0e7465cb

Change-Id: Iaa85b6d22c436ff2c46eafe500a74448403c5886
2016-12-02 18:36:43 +00:00
Jeff Sharkey
a07bcbcc27 DO NOT MERGE: Check provider access for content changes. am: ff2fede0dd
am: 7340749c2a

Change-Id: Iabb21a28a245d36f2247eaace573bdfd134f382d
2016-12-02 18:36:40 +00:00
Jeff Sharkey
74b36307a0 DO NOT MERGE: Check provider access for content changes. am: 4ddbf942a0
am: 190e20c2b5

Change-Id: Ib8d8b2b97b03acdd56e2cbdada404fb25535d234
2016-12-02 18:36:38 +00:00
Jeff Sharkey
d8ee1d0fcd DO NOT MERGE: Check provider access for content changes. am: c813f5dae2
am: 2b7584f5b1

Change-Id: I762e09539e99d1cb8b6fd810992b27255774060d
2016-12-02 18:36:38 +00:00
Jeff Sharkey
ad04786a3d DO NOT MERGE: Check provider access for content changes. am: 11e3e52bd9
am: bdfb26ac3b

Change-Id: I93ab9555383689078ae6c08534619e8f38a47aaf
2016-12-02 18:36:34 +00:00
Jeff Sharkey
b685f719f1 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dr1.5-dev
am: 0be332852e  -s ours

Change-Id: Ia1266b2276eb2219fbd19aff20985d278bd58fac
2016-12-02 18:20:10 +00:00
Jeff Sharkey
3f0e7465cb DO NOT MERGE: Check provider access for content changes.
am: 956bc433dc  -s ours

Change-Id: I36a6cf33803635becf8ff794bb8f4e02ba5cd1d4
2016-12-02 18:20:06 +00:00
Jeff Sharkey
a80cbeeee2 Merge "DO NOT MERGE: Check provider access for content changes." into mnc-dev
am: 8e14278209

Change-Id: I31e403ccc5207073d327a144f9b82fb93e01b865
2016-12-02 18:20:02 +00:00
Jeff Sharkey
414334595e Merge "DO NOT MERGE: Check provider access for content changes." into nyc-dev
am: fdef2cd87d

Change-Id: Ie6f22b55f9bb934f93d7821e362163bbdbc71753
2016-12-02 18:20:02 +00:00
Jeff Sharkey
bdfb26ac3b DO NOT MERGE: Check provider access for content changes.
am: 11e3e52bd9

Change-Id: Ice374d398888e2898f571cee7df73f5e47921655
2016-12-02 18:19:51 +00:00
Jeff Sharkey
190e20c2b5 DO NOT MERGE: Check provider access for content changes.
am: 4ddbf942a0

Change-Id: I9895591df11a2416cd3191ac9c790ecac167ece5
2016-12-02 18:19:50 +00:00
Jeff Sharkey
21d36dcc91 Merge "DO NOT MERGE: Check provider access for content changes." into nyc-mr1-dev
am: 5ec25934ce

Change-Id: I9608c14a117ab76bd08fa0a9b4d59b62ae1a28f5
2016-12-02 18:19:49 +00:00
Jeff Sharkey
2b7584f5b1 DO NOT MERGE: Check provider access for content changes.
am: c813f5dae2

Change-Id: I939bca8887198e2578916356d49b0f2f0a2bf3d2
2016-12-02 18:19:46 +00:00