Commit Graph

309172 Commits

Author SHA1 Message Date
Sergei Vasilinetc
16e211832e Merge "Check if layer is created in detachSurfaceTexture" 2017-02-03 01:08:26 +00:00
Jeff Sharkey
cecf30c3a2 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3 am: 4d1c25ec43 -s ours
am: 43f79eec8b

Change-Id: I46242f1ea9d7a2e63267c1d3d77c6ab3c5957435
2017-02-03 01:07:09 +00:00
Jeff Sharkey
6f47221263 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642 am: bf16fab4e7 -s ours
am: 65b0a6f596

Change-Id: Icf99c3f53e7281792db74ba5902ebf168bf07944
2017-02-03 01:06:20 +00:00
Jeff Sharkey
7cd3c47c29 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b am: 394357761e -s ours
am: bafa3c1d3b

Change-Id: Ifacdf34a063571d521dc635003ddabb3228460d4
2017-02-03 01:05:28 +00:00
Jeff Sharkey
d2a9d6fa27 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b am: 56131cf7c0 -s ours
am: cdb996355e

Change-Id: I5129414295d369564a603da928f19ee6b74d2d9f
2017-02-03 01:04:24 +00:00
Jeff Sharkey
badef8c88a Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7 am: e6060558b3
am: 1eb2ded281

Change-Id: I7b51f2a51a15ca961e345e8540f2f0ff517494d4
2017-02-03 01:04:21 +00:00
Jeff Sharkey
82ac124868 DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b am: fd855eeb29 am: e6f2767d54
am: c2a168d0ea

Change-Id: Ieb81e3872efd636a632ced390e41e2cd5156c81f
2017-02-03 01:02:56 +00:00
Jeff Sharkey
e7e70b868d Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3 am: 1e9b978dc7
am: 4a11140df3

Change-Id: I5706916619ea4498a6a8b681e57b6a4ee1a0d10d
2017-02-03 01:01:51 +00:00
Jeff Sharkey
43f79eec8b Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c am: b4c5c522e3
am: 4d1c25ec43  -s ours

Change-Id: I3a65198bb51f19e7b655d1da0a081fafbae066fd
2017-02-03 00:59:32 +00:00
Jeff Sharkey
1eb2ded281 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf am: ee958351b7
am: e6060558b3

Change-Id: I3c1874a0178425fe0d23659af68d924ade910c65
2017-02-03 00:59:15 +00:00
Jeff Sharkey
65b0a6f596 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5 am: f51e8e8642
am: bf16fab4e7  -s ours

Change-Id: Ie048d01183ce63035cfa63ab54414b40f0b2b2c7
2017-02-03 00:58:38 +00:00
Jeff Sharkey
bafa3c1d3b Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173 am: 4b3c59005b
am: 394357761e  -s ours

Change-Id: I8330da471c2770612f2898339f567b05853a2479
2017-02-03 00:57:39 +00:00
Jeff Sharkey
c2a168d0ea DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b am: fd855eeb29
am: e6f2767d54

Change-Id: I658d46b2c675ecedb08c32275d0cfbb6b84c1f77
2017-02-03 00:57:22 +00:00
Jeff Sharkey
cdb996355e DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164 am: 1ddaf2f96b
am: 56131cf7c0  -s ours

Change-Id: I2ca1c4bc0585eee8759d74c5e2a0b90afcd987dc
2017-02-03 00:56:34 +00:00
Jeff Sharkey
beef0ce5e1 Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315 am: 3985bf958e
am: 635ebe5d2c  -s ours

Change-Id: I30e5d2fbe96d4c25bdeac139537f9575fe9c8cb6
2017-02-03 00:56:31 +00:00
Jeff Sharkey
c3b2907486 DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7 am: d30514edc6 am: 2e3a277175
am: 758dede2d8

Change-Id: I8995e6ad4211353c28ac0d97e6908c343f1c8808
2017-02-03 00:56:28 +00:00
Jeff Sharkey
4a11140df3 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4 am: 7a6bd686a3
am: 1e9b978dc7

Change-Id: I665006f7ec40f409489bfdfa586cab9dfd0222e6
2017-02-03 00:56:19 +00:00
Jeff Sharkey
b3d3032d7e DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b am: 9285808f9d
am: 3f68664be2  -s ours

Change-Id: I19c59253ddf20ec3d5d8fed6075408919d9ab06b
2017-02-03 00:55:28 +00:00
Jeff Sharkey
fa4cdfd351 Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36 am: 806307106b am: d4eff25f9f
am: 9c3cc88067  -s ours

Change-Id: Idbd485ae40ffb78dea134903fbcbb52bcca89b52
2017-02-03 00:54:28 +00:00
Jeff Sharkey
4d1c25ec43 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c am: 00af0a6d2c
am: b4c5c522e3

Change-Id: Iae12207ee70e0212fce0f04a34891b7e20f7aeb0
2017-02-03 00:53:49 +00:00
Jeff Sharkey
2bca692720 DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 am: 190511955f
am: 8fa9048477  -s ours

Change-Id: Ia27d7b8170386df35a895c917d235bdd312827ca
2017-02-03 00:53:36 +00:00
Jeff Sharkey
e6060558b3 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours am: f19cea14cf
am: ee958351b7

Change-Id: I0413429b94182ce3c7500c3332f110137dceeda7
2017-02-03 00:53:05 +00:00
Jeff Sharkey
4105447204 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c am: 76ce0386db
am: 8f53070436

Change-Id: I8d71d9d8eb575b1b5ed043605b2bf2dce5f939b7
2017-02-03 00:52:54 +00:00
Jeff Sharkey
e6f2767d54 DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320 am: 928574895b
am: fd855eeb29

Change-Id: I7c7a9ef89e04e5420655d4ecba55c37cfacaf84b
2017-02-03 00:52:36 +00:00
Jeff Sharkey
4fd13301b0 DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9 am: 8501b686f7
am: 5647953584

Change-Id: I9bb45562a4d0b30e2a173d3377101c42a7a58f8f
2017-02-03 00:51:22 +00:00
Jeff Sharkey
1e9b978dc7 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472 am: a7388f1ed4
am: 7a6bd686a3

Change-Id: I30d3bad3c7c6e6779d5c2b964ae4aa5b68b82bbd
2017-02-03 00:51:19 +00:00
Jeff Sharkey
758dede2d8 DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7 am: d30514edc6
am: 2e3a277175

Change-Id: I24b189c0e0c006a06c4c08e64a1de911fa7cc32c
2017-02-03 00:51:18 +00:00
Jeff Sharkey
bf16fab4e7 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730 am: c0cc8695a5
am: f51e8e8642

Change-Id: I94a2e244e7ab2d9571632f2d79fcce0ed38e3320
2017-02-03 00:50:28 +00:00
Jeff Sharkey
394357761e Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074 am: 8c9ff68173
am: 4b3c59005b

Change-Id: Ibc4221c090b1dab98c085486733c987d96c99210
2017-02-03 00:49:28 +00:00
Jeff Sharkey
56131cf7c0 DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164
am: 1ddaf2f96b

Change-Id: I06a6d16b17cd5611247a442c2e7fa7b7b21134cf
2017-02-03 00:48:41 +00:00
Jeff Sharkey
635ebe5d2c Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6 am: 609145c315
am: 3985bf958e

Change-Id: Ib79d5010b4de507e66cb9a301c152d2f3c81d706
2017-02-03 00:47:40 +00:00
Jeff Sharkey
fd855eeb29 DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours am: 1a9c03f320
am: 928574895b

Change-Id: I308132391fced2c9de04e8bcfe9784edc5cacb55
2017-02-03 00:47:35 +00:00
Jeff Sharkey
8f53070436 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56 am: 06b98e6b3c
am: 76ce0386db

Change-Id: I85d3cd8cb4d67258132cb89f1dbdb4dc75bc8d1b
2017-02-03 00:47:05 +00:00
Jeff Sharkey
3f68664be2 DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe am: e25ab62f5b
am: 9285808f9d

Change-Id: Ifde04e3733d5aa69968a21a1af7dbc4b0094797d
2017-02-03 00:46:49 +00:00
Jeff Sharkey
7a6bd686a3 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours am: f68199a472
am: a7388f1ed4

Change-Id: I92e758c2f2a5d978b9fcd4779e486711f7b1ebe3
2017-02-03 00:46:45 +00:00
Jeff Sharkey
5647953584 DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9
am: 8501b686f7

Change-Id: Id2cece709462063fd7211dbb04c1f27edf7d64ef
2017-02-03 00:46:15 +00:00
Jeff Sharkey
2e3a277175 DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473 am: 86a0c4d4d7
am: d30514edc6

Change-Id: Id0d93a1acb0d2a6d33643a8074b575beac97cee4
2017-02-03 00:45:48 +00:00
Jeff Sharkey
ee958351b7 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8 am: 2848738526 -s ours
am: f19cea14cf

Change-Id: I80e9b340be8824005055d2fc9ab9effa49a3e5d2
2017-02-03 00:45:39 +00:00
Jeff Sharkey
b4c5c522e3 Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d am: d20b04a41d -s ours am: 4b0164b27c
am: 00af0a6d2c

Change-Id: I367da25f89c5c982f6eacaa1929dbbcbf15801f0
2017-02-03 00:43:16 +00:00
Jeff Sharkey
928574895b DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours
am: 1a9c03f320

Change-Id: I22e7edcb7c6f287da63dfd636ffc777453d2b957
2017-02-03 00:42:27 +00:00
Jeff Sharkey
f51e8e8642 DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours am: 9346bec730
am: c0cc8695a5

Change-Id: Ia0e1987122659a913145fc86a6626e0dd1890f24
2017-02-03 00:42:23 +00:00
Jeff Sharkey
d30514edc6 DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473
am: 86a0c4d4d7

Change-Id: Ia7727ded9f86932d3f31469e40e63bee0a035c59
2017-02-03 00:41:20 +00:00
Jeff Sharkey
a7388f1ed4 Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223 am: 8469d52d41 -s ours
am: f68199a472

Change-Id: Icea5f48ca2c969328210a000ffe88dc94e70a0c8
2017-02-03 00:41:16 +00:00
Jeff Sharkey
76ce0386db Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201 am: 33cd012e56
am: 06b98e6b3c

Change-Id: I7b9172df8b14f15e0bf6baba2ede19230ac14d30
2017-02-03 00:41:09 +00:00
Jeff Sharkey
4b3c59005b Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours am: f82c373074
am: 8c9ff68173

Change-Id: Iaa739f638e66376a2aa145a465255f738f9b3f1b
2017-02-03 00:40:52 +00:00
Jeff Sharkey
8501b686f7 DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5
am: 1007b773b9

Change-Id: I654882046c5024d2cbe939bd2727f15550ba4cef
2017-02-03 00:40:05 +00:00
Jeff Sharkey
1ddaf2f96b DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5
am: bd2bec9164

Change-Id: I9d9889577061ada5de8c0213ec73d257469466e8
2017-02-03 00:40:04 +00:00
Jeff Sharkey
3985bf958e Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6
am: 609145c315

Change-Id: I212139b16c6b00a3a1b61a851bb7f7099ecf2120
2017-02-03 00:39:31 +00:00
Jeff Sharkey
9285808f9d DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe
am: e25ab62f5b

Change-Id: Id801fbb628423a239da2db2a058ed7a9dcf1c46a
2017-02-03 00:38:43 +00:00
Jeff Sharkey
86a0c4d4d7 DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours
am: 09d230d473

Change-Id: I058f4db80418f939c2f1e3e6f2b61c40b2a3fd91
2017-02-03 00:37:48 +00:00