git.osdn.net Git - android-x86/frameworks-base.git/log

Orion Hodson [Mon, 6 Feb 2017 10:37:24 +0000 (10:37 +0000)]

Merge "Add bytecodes for invoke-polymorphic" am: ef59955f58
am: dcaa9fd642

Change-Id: I4dba3f073900fa47cb1c4fa8ec36fb8f547fd982

commit | commitdiff | tree

Orion Hodson [Mon, 6 Feb 2017 10:30:40 +0000 (10:30 +0000)]

Merge "Add bytecodes for invoke-polymorphic"
am: ef59955f58

Change-Id: If95860a3680dc8857b54a864917d5074eba57c9a

commit | commitdiff | tree

Orion Hodson [Mon, 6 Feb 2017 10:21:53 +0000 (10:21 +0000)]

Merge "Add bytecodes for invoke-polymorphic"

commit | commitdiff | tree

Chris Craik [Fri, 3 Feb 2017 21:57:58 +0000 (21:57 +0000)]

Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE" am: 6678d34133 -s ours
am: 6385d23f43 -s ours

Change-Id: Ifbd64ab5edd16d84aa252408b1ceafc0a713321c

commit | commitdiff | tree

Chris Craik [Fri, 3 Feb 2017 21:53:26 +0000 (21:53 +0000)]

Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE"
am: 6678d34133 -s ours

Change-Id: I841f908f57d94ee91c72ef2c6d428cc1f14a5690

commit | commitdiff | tree

Chris Craik [Fri, 3 Feb 2017 21:44:34 +0000 (21:44 +0000)]

Merge "Add ShadowShaderAnimation benchmark DO NOT MERGE"

commit | commitdiff | tree

Paul Lawrence [Fri, 3 Feb 2017 21:28:30 +0000 (21:28 +0000)]

Merge "Expand whitelist" am: fe88a5e81d
am: f907b0fcc7

Change-Id: Ifb2506e0f8cf697d1bbd4eb0ea744ed8fc9d2b63

commit | commitdiff | tree

Paul Lawrence [Fri, 3 Feb 2017 21:23:55 +0000 (21:23 +0000)]

Merge "Expand whitelist"
am: fe88a5e81d

Change-Id: I9bc80af8b045edb667840828fc84f2e0ab12863b

commit | commitdiff | tree

Paul Lawrence [Fri, 3 Feb 2017 21:16:59 +0000 (21:16 +0000)]

Merge "Expand whitelist"

commit | commitdiff | tree

Tyler Gunn [Fri, 3 Feb 2017 21:15:36 +0000 (21:15 +0000)]

Merge "Add "wifi lost" disconnect cause." am: 802b0c8fd1
am: 4e26b8e75e

Change-Id: I783d8693258d31341d946fa1f20e4c744ee410b3

commit | commitdiff | tree

Tyler Gunn [Fri, 3 Feb 2017 21:10:39 +0000 (21:10 +0000)]

Merge "Add "wifi lost" disconnect cause."
am: 802b0c8fd1

Change-Id: I2f1ac8f8d8874f30720790888fa4e6beabc03c91

commit | commitdiff | tree

Tyler Gunn [Fri, 3 Feb 2017 21:03:22 +0000 (21:03 +0000)]

Merge "Add "wifi lost" disconnect cause."

commit | commitdiff | tree

Paul Lawrence [Fri, 3 Feb 2017 20:22:49 +0000 (20:22 +0000)]

Merge "Optimize seccomp" am: 7e812616c9
am: 9375f3eff6

Change-Id: I8cc56a3e5512764a02004f27f976e72da554ef38

commit | commitdiff | tree

Paul Lawrence [Fri, 3 Feb 2017 20:19:11 +0000 (20:19 +0000)]

Merge "Optimize seccomp"
am: 7e812616c9

Change-Id: I6061c25fe18b136d9a4920acd3f54043c44abe4a

commit | commitdiff | tree

Paul Lawrence [Fri, 3 Feb 2017 20:14:14 +0000 (20:14 +0000)]

Merge "Optimize seccomp"

commit | commitdiff | tree

Chris Craik [Thu, 2 Feb 2017 23:41:58 +0000 (15:41 -0800)]

Add ShadowShaderAnimation benchmark DO NOT MERGE

Bug: 34809371
Test: manual

New benchmark uses several levels of overdraw from just shadows to benchmark
shadow shader performance.

Tessellation workload is minimal, due to simple rect caster shape.

Change-Id: I572476bd54e04566851f39027ada7254597b37f8

commit | commitdiff | tree

Tyler Gunn [Mon, 30 Jan 2017 17:52:55 +0000 (09:52 -0800)]

Add "wifi lost" disconnect cause.

New disconnect cause used when wifi call is dropped due to loss of wifi
connection.

Test: Manual, unit.
Merged-In: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0
Bug: 32571209
Change-Id: Iedaa9f54ff6dbfe90a6ce01fc9eb0aad126d05f0

commit | commitdiff | tree

Paul Lawrence [Fri, 3 Feb 2017 18:10:32 +0000 (10:10 -0800)]

Expand whitelist

Bug: 34908783
Test: Device boots. Unable to test app due to Fake OEM error
Change-Id: I2a0f5646fa39f95875ecb661599d76f4b28a43ac

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:38:07 +0000 (01:38 +0000)]

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 am: cecf30c3a2 am: 5a50d2b12c
am: 34df10ec98

Change-Id: I3ec708579e86a3008dc0b660dee7b792fef0a11f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:37:02 +0000 (01:37 +0000)]

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 am: 6f47221263 am: 47bfa0ab25
am: 6cfa84791d

Change-Id: I6e3919c82860452f42b6a09f27c9cecc720c82ef

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:35:51 +0000 (01:35 +0000)]

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 am: 7cd3c47c29 am: 770eff87cd
am: ce15555148

Change-Id: I3f313eea586334158e710ca4a6545127e7fa8855

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:34:46 +0000 (01:34 +0000)]

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 am: d2a9d6fa27 am: 8d9953964a
am: 8c23d1aadb

Change-Id: I92db1043b77799dd3c7a9c6852c258bc0d5aa8ed

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:32:11 +0000 (01:32 +0000)]

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: I7ceae022988bc333631cd83eed868ae573096bb4

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:31:09 +0000 (01:31 +0000)]

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: I4598997f5c121f81170fc29d52151e727e143ead

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:30:04 +0000 (01:30 +0000)]

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: I23fe0c7c446c3c2ed0570606a4ac9860df866295

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:28:43 +0000 (01:28 +0000)]

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: Ifc5567bfeb3736c96d3637bfb98b61609b0dbfda

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:27:32 +0000 (01:27 +0000)]

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: I1a5282c25eba331df935ab2863c33406e8b694fb

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:26:36 +0000 (01:26 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5 am: 1007b773b9
am: 8501b686f7

Change-Id: Icd5ceccc8048ca31363a190d66a3f9d0dff84e1c

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:25:39 +0000 (01:25 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d am: 6db504c6f6
am: 609145c315

Change-Id: I604956b3959cad56e7fa7c39e4fd51fc8c42a5c7

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:24:53 +0000 (01:24 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b am: e79d2be2fe
am: e25ab62f5b

Change-Id: Ibf4de297e76cc0dc849d4f16ff1ae29b9ada950c

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:24:20 +0000 (01:24 +0000)]

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 am: cecf30c3a2
am: 5a50d2b12c

Change-Id: I32bf2850fe25f5e0ec9df96042da467a21d90990

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:23:52 +0000 (01:23 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev am: 6b8ae05e36
am: 806307106b

Change-Id: I0dca98d50cb5a1f835be0c9cd960d8ed15f16e7a

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:23:23 +0000 (01:23 +0000)]

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 am: 6f47221263
am: 47bfa0ab25

Change-Id: I68ffb4a6973c8af213030ea441fbe2b93353fa9f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:22:53 +0000 (01:22 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3
am: 30a4388481

Change-Id: I8b612304980150f522b0424e564f3bedf030c2b9

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:22:20 +0000 (01:22 +0000)]

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 am: 7cd3c47c29
am: 770eff87cd

Change-Id: I8aa0ade785b829b34490c3dbe80397fe7fb6bd3c

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:21:35 +0000 (01:21 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am: af85feef36 -s ours am: d9c8155943 -s ours am: bf1c88f34e -s ours am: c1a0e6db4c -s ours am: 20756a97ea -s ours am: 9394305cd7 -s ours am: 9690f8899b -s ours am: 32c6684a67 -s ours am: bcc2e70d40 -s ours am: 6b398f72cb -s ours
am: cda0f97790 -s ours

Change-Id: Icb63044e32d8898cdb5624d38fef4de30b818978

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:20:32 +0000 (01:20 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours am: 051f01700e -s ours am: a3685e4bb5 -s ours am: 3f7ed73fdd -s ours am: 64e2b4f825 -s ours am: 170f2b9e7a -s ours am: 2b01e24b3f -s ours am: 6b1fd0f9cf -s ours am: 56be9656f7 -s ours am: e3d5ea3a18 -s ours
am: 58d9af0c77 -s ours

Change-Id: I23f74f1c1588800b2dbc4c33ef15ab457951b57d

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:19:19 +0000 (01:19 +0000)]

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 am: d2a9d6fa27
am: 8d9953964a

Change-Id: I85e2fcd6e4ab5d5183318db129ae17d5d2376005

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:19:09 +0000 (01:19 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e -s ours am: ec3e2b9dcb -s ours am: 483b561f41 am: 6e850f85fc -s ours am: bdeae85e54 am: 4e4dfacb7b am: c19d459e2a am: 55176e2d5a -s ours am: f1e045b733 am: dcc633f1f8 am: 67a4d3e428
am: 710a7e40dc

Change-Id: I4959ae33844b003b6c37325c5b572239cf5da47f

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:18:17 +0000 (01:18 +0000)]

Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda am: aec526f710 -s ours am: 14e38a8b21 am: 429683b469 am: ceb288f00b am: 5acc268372 -s ours am: ea91d2d0cc am: 73d19fc1a0 am: 5a2e7e2e58
am: b2cdb4e2dd

Change-Id: I06acb1de8e89688e64b65f694cf29278a4cf7dde

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:17:18 +0000 (01:17 +0000)]

DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1 -s ours am: 3a09dac9c4 am: 50c6d2ff56 am: db40505c42 am: af7a739889 -s ours am: 5fce769ecf am: 642912652e am: a293067f0b
am: 3411150115

Change-Id: Ie622523996134026550caa6af4c5a858aeb04a60

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:15:15 +0000 (01:15 +0000)]

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
am: cecf30c3a2

Change-Id: I3737e39d6433792abcd4f78bbf19dc19596f582e

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:14:17 +0000 (01:14 +0000)]

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
am: 6f47221263

Change-Id: I8736bfebc8038f24628387444bc656c103fcdf36

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:13:24 +0000 (01:13 +0000)]

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
am: 7cd3c47c29

Change-Id: I91895a68c262cce27738b106c6f5d1b75a311b73

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:12:38 +0000 (01:12 +0000)]

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
am: d2a9d6fa27

Change-Id: I206033dd081f2c7a04364815d8760261b87b435c

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:07:09 +0000 (01:07 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:06:20 +0000 (01:06 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:05:28 +0000 (01:05 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:04:24 +0000 (01:04 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:59:32 +0000 (00:59 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:59:15 +0000 (00:59 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:58:38 +0000 (00:58 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:57:39 +0000 (00:57 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:56:34 +0000 (00:56 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:53:49 +0000 (00:53 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:53:05 +0000 (00:53 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:52:36 +0000 (00:52 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:51:19 +0000 (00:51 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:50:28 +0000 (00:50 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:49:28 +0000 (00:49 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:48:41 +0000 (00:48 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5 am: bd2bec9164
am: 1ddaf2f96b

Change-Id: I06a6d16b17cd5611247a442c2e7fa7b7b21134cf

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:47:35 +0000 (00:47 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:46:45 +0000 (00:46 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:45:48 +0000 (00:45 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:45:39 +0000 (00:45 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:43:16 +0000 (00:43 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:42:27 +0000 (00:42 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53 am: 4942836d3c -s ours
am: 1a9c03f320

Change-Id: I22e7edcb7c6f287da63dfd636ffc777453d2b957

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:42:23 +0000 (00:42 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:41:20 +0000 (00:41 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours am: 09d230d473
am: 86a0c4d4d7

Change-Id: Ia7727ded9f86932d3f31469e40e63bee0a035c59

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:41:16 +0000 (00:41 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:41:09 +0000 (00:41 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:40:52 +0000 (00:40 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:40:05 +0000 (00:40 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846 am: 9f70b6d4c5
am: 1007b773b9

Change-Id: I654882046c5024d2cbe939bd2727f15550ba4cef

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:40:04 +0000 (00:40 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours am: 05749525a5
am: bd2bec9164

Change-Id: I9d9889577061ada5de8c0213ec73d257469466e8

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:37:48 +0000 (00:37 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am: bdb0c8fc17 -s ours
am: 09d230d473

Change-Id: I058f4db80418f939c2f1e3e6f2b61c40b2a3fd91

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:35:19 +0000 (00:35 +0000)]

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

Change-Id: I4dda89507d1003f82af6e204c9983732b36927da

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:34:57 +0000 (00:34 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c am: 7c0ea478a8
am: 2848738526 -s ours

Change-Id: I7c56e83a5de15ec7d3432e3ca4ec385499069f40

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:34:33 +0000 (00:34 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb am: 61e9179646 -s ours
am: 9346bec730

Change-Id: I456a98abbdcb7d6f7d959a791da726f56f55edf8

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:34:07 +0000 (00:34 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31 am: 5536402f6d
am: 6db504c6f6

Change-Id: I4d1e712d09daae9621c5acf336b9ead190920e98

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:34:04 +0000 (00:34 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am: b5740f8c53
am: 4942836d3c -s ours

Change-Id: I72d83bb758c1b70a46eb244d93b932ea2dcf1cb4

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:34:00 +0000 (00:34 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours am: 0e09e8c201
am: 33cd012e56

Change-Id: I8444b378a3554ded73e914e332c55e4e0ce36098

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:33:40 +0000 (00:33 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530 am: 5d65931af5 -s ours
am: f82c373074

Change-Id: I603a9a75c3874f1b7cf099aa26b865fdbe7b0e99

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:33:14 +0000 (00:33 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b
am: e79d2be2fe

Change-Id: I1d9b46d67928221e3d06a5f17031e8ca63067280

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:32:57 +0000 (00:32 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119 am: fa22018223
am: 8469d52d41 -s ours

Change-Id: Ib3b38a9c4dacf09aeec385e46b464598c0214a76

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:32:50 +0000 (00:32 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846
am: 9f70b6d4c5

Change-Id: I7b5776f73bc99210f018e8e9530f91b032a57d40

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:32:49 +0000 (00:32 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73 am: 73f95823f8 -s ours
am: 05749525a5

Change-Id: Id298d130a52b44ad9252f8a65c88bb63fbb86f7f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:31:56 +0000 (00:31 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306
am: bdb0c8fc17 -s ours

Change-Id: I2d00e5bd394e93e8b2ac218056f30225580f681b

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:30:04 +0000 (00:30 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours am: b058dc139d
am: d20b04a41d -s ours

Change-Id: I2a98850d4c3246c02d5197adff9503be2839df01

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:29:34 +0000 (00:29 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f am: 8f4f4daf2c
am: 7c0ea478a8

Change-Id: I5b1974499b3dba96134a14ab5b00a8942a02fe6f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:29:13 +0000 (00:29 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 2dfdf662d0 -s ours am: 4a4b6bfafb
am: 61e9179646 -s ours

Change-Id: Ibfdb4128b1db25db478f9b4cb987d0754ddd9124

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:28:43 +0000 (00:28 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115
am: b5740f8c53

Change-Id: Ieca522b743bf9d1840b657b19a5a4f4ffe80a8fd

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:23:24 +0000 (00:23 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-mr1-dev am: 6d3573e530
am: 5d65931af5 -s ours

Change-Id: I14933edb3f93eea4156698bb2669938849c30697

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:22:32 +0000 (00:22 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31
am: 5536402f6d

Change-Id: I90da8f03fecb6307cfae5bd4a8fec48a6136d29f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:22:28 +0000 (00:22 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 6f13f73b73
am: 73f95823f8 -s ours

Change-Id: I1361483ca420b86bf1adedfe297d4dcdf5121a18

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:22:20 +0000 (00:22 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d1471 -s ours
am: 0e09e8c201

Change-Id: I07157359ef396832b3c20b745dc09c32b3e85db6

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:22:16 +0000 (00:22 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119
am: fa22018223

Change-Id: Ifb220fbac07f4dcbb455080107ebc765611cf022

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:22:15 +0000 (00:22 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into lmp-dev am: 3e4faac39f -s ours
am: b058dc139d

Change-Id: Idd1aeb4749741aa8bae76cf43ce3f2bdceff077d

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:21:58 +0000 (00:21 +0000)]

Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev am: e6be8d765f
am: 8f4f4daf2c

Change-Id: I049f66856f9354432f722fd29248720d76e6c5e1

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:21:19 +0000 (00:21 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d
am: d819c2386b

Change-Id: I6f5d0680a0cd60a02060851bcdbb0d1fa2494688

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:21:18 +0000 (00:21 +0000)]

DO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours
am: 4d90982846

Change-Id: I1defb93e1af42c503f94c0af2ad8dbdb361be6ab