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

Jeff Sharkey [Fri, 3 Feb 2017 01:55:01 +0000 (01:55 +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 am: 0792846ea5
am: 04bfaf9749 -s ours

Change-Id: I601910b6d9b563ad95c40a7c45bdc618c469cca8

commit | commitdiff | tree

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

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

Change-Id: I521a26e52905983a855217aa8e3d0f9b68fe2d44

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 am: 825a242ea9
am: 42dbff71a1 -s ours

Change-Id: I30ca63aef3e30b65de91aff0f48904d9c8b75617

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:48:20 +0000 (01:48 +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 am: e12285ac47 -s ours
am: 1a934fe836 -s ours

Change-Id: I52e01060bb82c4d92b1c7cb640f91ba44d7b44dc

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:47:20 +0000 (01:47 +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 am: b696cba781 -s ours
am: 20ddce2633 -s ours

Change-Id: I43bc5a58a625435ecd6914428bda7291072329c0

commit | commitdiff | tree

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

Merge "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 am: b93bc585f0" into nyc-mr2-dev-plus-aosp
am: f6fa670588 -s ours

Change-Id: Idae546a67614dff9ecaf59443ad5dc8c61cdd03f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:45:50 +0000 (01:45 +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 am: b93bc585f0
am: a53b4376eb -s ours

Change-Id: I9c7fe108a9ae4a2a4e32cb8eebd4af446dea7173

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:44:33 +0000 (01:44 +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 am: 20d2868f5c
am: e654f46e20 -s ours

Change-Id: I90b98b574adefd86f8e9b31e887dc2a85d3cc99c

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:43:34 +0000 (01:43 +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 am: cb84f799ff
am: d11c7025cd -s ours

Change-Id: Iafd344132d85ea68c337aea9b9f746a7e151b0b2

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:42:33 +0000 (01:42 +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 am: 7c6d80e66c
am: d4b5177f68 -s ours

Change-Id: Ifaa5d17d83a12fe34e48b82767b21ed75878c787

resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp am: 5c6041843d
am: 1350f9a1fe

Change-Id: Icc805680756c4963d45d64f3df76e013e66323ed

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:40:47 +0000 (01:40 +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 am: badef8c88a
am: 8b7b19144d -s ours

Change-Id: I6a269ab8744cc4c892a160823107199a313270cf

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:39:55 +0000 (01:39 +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 am: c2a168d0ea
am: 82ac124868 -s ours

Change-Id: I22c9a4420754e792c72bb317e58d01f322c3aad5

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:38:53 +0000 (01:38 +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 am: 4a11140df3
am: e7e70b868d -s ours

Change-Id: Idb866bd10846d9f7e454087569e6f976222846a5

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:37:56 +0000 (01:37 +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 am: 758dede2d8
am: c3b2907486 -s ours

Change-Id: I482e11435602d2d655219e259bedd7a8b27d822b

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:37:00 +0000 (01:37 +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 am: 8f53070436
am: 4105447204 -s ours

Change-Id: Ic0032332e8601221d575482f2226463c309971db

commit | commitdiff | tree

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

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

Change-Id: Idc26cf19e2d274104877a60579258d9520a17a46

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:35:03 +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
am: 0792846ea5

Change-Id: I389df4e503e76b311a9b93e3327b423b07e7de26

commit | commitdiff | tree

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

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

Change-Id: Iebcdf8ff79316c718a461445eba8169c68d00e1b

commit | commitdiff | tree

Yohei Yukawa [Fri, 3 Feb 2017 01:33:38 +0000 (01:33 +0000)]

Merge "Simplify the constructor of InputMethodInfo"

commit | commitdiff | tree

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

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

Change-Id: If76c1073c80718296c814b43971b89f642ada7c9

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:32:51 +0000 (01:32 +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
am: e12285ac47 -s ours

Change-Id: I241cf4fcfae223ab115aff90ba70ac84a2e773d4

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:31:40 +0000 (01:31 +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
am: b696cba781 -s ours

Change-Id: Ifedcf384ac1fd3960045ab1481c2aaedb7c39264

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 3 Feb 2017 01:29:30 +0000 (01:29 +0000)]

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:28:59 +0000 (01:28 +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
am: b93bc585f0

Change-Id: Ic6f3436322ba32797858d454d53b8210b46e0f29

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:28:54 +0000 (01:28 +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: Iae6d62ce80959214aac7299ff1077a54d69e03b5

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:27:29 +0000 (01:27 +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
am: 20d2868f5c

Change-Id: Iaa64dee6de0055daa896ab548756f70eb9dd4ca8

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:26:20 +0000 (01:26 +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
am: cb84f799ff

Change-Id: Ic1bffe4a69db81544bfff9543ae94aed0ee4a0f3

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:25:30 +0000 (01:25 +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: I78fd2fdabdbaf2d10f930a0ccc46cb9380b4b5ad

commit | commitdiff | tree

Suprabh Shukla [Fri, 3 Feb 2017 01:25:19 +0000 (01:25 +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
am: 7c6d80e66c

Change-Id: Ia28ea9874cabde49ce481000e1bdba3d709eaecb

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

resolve merge conflicts of e06c03d8437f to nyc-mr1-dev-plus-aosp
am: 5c6041843d

Change-Id: I7f0cd240b6054f57616e223f31d09a4152fe34e9

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: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:10:00 +0000 (01:10 +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
am: badef8c88a

Change-Id: I4fe568d6b43e5a5c06aee6339f6fe4618865c2c6

commit | commitdiff | tree

Sergei Vasilinetc [Fri, 3 Feb 2017 01:08:23 +0000 (01:08 +0000)]

Merge "Check if layer is created in detachSurfaceTexture"

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 01:04:21 +0000 (01:04 +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: I7b51f2a51a15ca961e345e8540f2f0ff517494d4

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:02:56 +0000 (01:02 +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
am: c2a168d0ea

Change-Id: Ieb81e3872efd636a632ced390e41e2cd5156c81f

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 01:01:51 +0000 (01:01 +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
am: 4a11140df3

Change-Id: I5706916619ea4498a6a8b681e57b6a4ee1a0d10d

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: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:57:22 +0000 (00:57 +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: I658d46b2c675ecedb08c32275d0cfbb6b84c1f77

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:56:31 +0000 (00:56 +0000)]

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

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:56:28 +0000 (00:56 +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
am: 758dede2d8

Change-Id: I8995e6ad4211353c28ac0d97e6908c343f1c8808

commit | commitdiff | tree

Jeff Sharkey [Fri, 3 Feb 2017 00:56:19 +0000 (00:56 +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: I665006f7ec40f409489bfdfa586cab9dfd0222e6

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

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

commit | commitdiff | tree

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

DO NOT MERGE. No direct Uri grants from system. am: b61338ecb3 am: 30a4388481 am: 190511955f
am: 8fa9048477 -s ours

Change-Id: Ia27d7b8170386df35a895c917d235bdd312827ca

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:54 +0000 (00:52 +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
am: 8f53070436

Change-Id: I8d71d9d8eb575b1b5ed043605b2bf2dce5f939b7

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:22 +0000 (00:51 +0000)]

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

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:51:18 +0000 (00:51 +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: I24b189c0e0c006a06c4c08e64a1de911fa7cc32c

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:40 +0000 (00:47 +0000)]

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

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:47:05 +0000 (00:47 +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: I85d3cd8cb4d67258132cb89f1dbdb4dc75bc8d1b

commit | commitdiff | tree

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

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

Change-Id: Ifde04e3733d5aa69968a21a1af7dbc4b0094797d

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:46:15 +0000 (00:46 +0000)]

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

Change-Id: Id2cece709462063fd7211dbb04c1f27edf7d64ef

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: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: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:39:31 +0000 (00:39 +0000)]

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

Change-Id: I212139b16c6b00a3a1b61a851bb7f7099ecf2120

commit | commitdiff | tree

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

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

Change-Id: Id801fbb628423a239da2db2a058ed7a9dcf1c46a

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: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: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: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: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:24:43 +0000 (00:24 +0000)]

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

Change-Id: I9676c155e718b25830980da5792b49e25c1ccecd

commit | commitdiff | tree

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

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

Change-Id: I0a4149d160f990357e4e8ee7229bfbdf68b67a68

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