OSDN Git Service
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Jeff Sharkey [Fri, 3 Feb 2017 00:21:15 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
b18bd06e94
am:
9434773306
Change-Id: I1dae5df31fbd29f96a3f8adf898fd6c7c716f56e
Jeff Sharkey [Fri, 3 Feb 2017 00:21:10 +0000 (00:21 +0000)]
DO NOT MERGE. No direct Uri grants from system. am:
bac46f5b65
am:
3da69c1115
Change-Id: I19ff97bb24c7cf985c8877b0c365f6eb4624fe80
Jeff Sharkey [Fri, 3 Feb 2017 00:12:45 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
am:
e6be8d765f
Change-Id: I502a04687a3a7840860e1a3af0a702f7162a8897
Jeff Sharkey [Fri, 3 Feb 2017 00:12:43 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
bac46f5b65
Change-Id: I87dbe96e14c68b5d99b43bf7ad3d653d5fb33a61
Jeff Sharkey [Fri, 3 Feb 2017 00:12:31 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
am:
1f007d1471 -s ours
Change-Id: I5fb0f4d1ebf169c8e1309c1d7549d34b362c8328
Jeff Sharkey [Fri, 3 Feb 2017 00:12:26 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
021747a076 -s ours
Change-Id: Id5d516b36b7cafc364d49109813d12f73ddb4684
Jeff Sharkey [Fri, 3 Feb 2017 00:12:19 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
am:
0354b89d31
Change-Id: I186f3fc1530e8a554916f83bf8e9fb98adceb507
Jeff Sharkey [Fri, 3 Feb 2017 00:12:15 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
3e2652a55d
Change-Id: I19c72afa1d6407786b4a02d232f8489c42ea700d
Jeff Sharkey [Fri, 3 Feb 2017 00:12:11 +0000 (00:12 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
am:
7115ad7119
Change-Id: Ib9e5a56a4bac34dbf9ef3fc4122d4a2ac1e0bb7e
Jeff Sharkey [Fri, 3 Feb 2017 00:12:08 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
6f13f73b73
Change-Id: I28627832c3ec765d6761afbf3fc508d1069c9582
Jeff Sharkey [Fri, 3 Feb 2017 00:12:08 +0000 (00:12 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
b18bd06e94
Change-Id: Ia946b314e7c12c5a04f6c117a9b2e2537fc006e9
Jeff Sharkey [Fri, 3 Feb 2017 00:10:09 +0000 (00:10 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev
am:
6b8ae05e36
Change-Id: I3390fac08bf7047fce526b2553c1fb2908c4167c
Jeff Sharkey [Fri, 3 Feb 2017 00:10:05 +0000 (00:10 +0000)]
DO NOT MERGE. No direct Uri grants from system.
am:
b61338ecb3
Change-Id: I56e937265e43bc9dd0adbe24167ae52b5bc0b818
Jeff Sharkey [Thu, 2 Feb 2017 23:59:40 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:39 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:38 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:37 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
Jeff Sharkey [Thu, 2 Feb 2017 23:59:37 +0000 (23:59 +0000)]
Merge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev
Suprabh Shukla [Thu, 2 Feb 2017 23:57:44 +0000 (23:57 +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
Change-Id: Idbbf54525fa0b14db3ff710e3e50958c8e80a515
Suprabh Shukla [Thu, 2 Feb 2017 23:53:23 +0000 (23:53 +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
Change-Id: I9fd4eab1c0c4728965678e47cffe1c5bfa0b3638
Suprabh Shukla [Thu, 2 Feb 2017 23:49:45 +0000 (23:49 +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
Change-Id: Ia68ce30d01f44d47f5edd1c7200912179f84efaf
Suprabh Shukla [Thu, 2 Feb 2017 23:48:18 +0000 (23: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
Change-Id: I0db97d059b78d12aba30255cfc357f51018d5548
Suprabh Shukla [Thu, 2 Feb 2017 23:45:40 +0000 (23:45 +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
Change-Id: I017e9d54ab618f9955787cfa4374868b94b3d8d7
Suprabh Shukla [Thu, 2 Feb 2017 23:43:18 +0000 (23:43 +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
Change-Id: Ic815923ff5d6cafced9d155d7188acc4ba8c4d6a
Suprabh Shukla [Thu, 2 Feb 2017 23:41:18 +0000 (23:41 +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
Change-Id: Ia8301b1e589f87a4cb428cd7644ee6b5944f54a5
Suprabh Shukla [Thu, 2 Feb 2017 23:37:25 +0000 (23:37 +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
Change-Id: I15bd6695657f5bf7b802ad5b1119b63f669fc669
Suprabh Shukla [Thu, 2 Feb 2017 23:35:42 +0000 (23:35 +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
Change-Id: I59f0209f21655e63bc06429861188aea1b2d16ee
Jack Yu [Thu, 2 Feb 2017 23:32:36 +0000 (15:32 -0800)]
resolve merge conflicts of
e06c03d8437f to nyc-mr1-dev-plus-aosp
Test: Manual test
Change-Id: I13f288c5056b672eec00f850f9d2ee6db73b7a44
Suprabh Shukla [Thu, 2 Feb 2017 23:31:51 +0000 (23:31 +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
Change-Id: I5f41628b921b53ba4cd5588404fe28c4b77b29ea
Suprabh Shukla [Thu, 2 Feb 2017 23:31:41 +0000 (23:31 +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
Change-Id: I976532a5bc3d21d637da69e2f508eeb532ec1996
Suprabh Shukla [Thu, 2 Feb 2017 23:31:09 +0000 (23: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
Change-Id: I91a75624e85cf6f32538de378bac43367f118672
Suprabh Shukla [Thu, 2 Feb 2017 23:26:38 +0000 (23:26 +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
Change-Id: Ic1a85765c15ba86b594f7ba654d4a211db91e3a2
Suprabh Shukla [Thu, 2 Feb 2017 23:26:21 +0000 (23:26 +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
Change-Id: I0249dfa725ca30353d557396b3ffe1b1f5169dad
Suprabh Shukla [Thu, 2 Feb 2017 23:24:38 +0000 (23:24 +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
Change-Id: Ide2acd4e61618be87ad4c32d735a4cd7f3781d0b
Suprabh Shukla [Thu, 2 Feb 2017 23:21:37 +0000 (23:21 +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
Change-Id: I42ed0e37dc68919a2a3e6b9b6aaa5030a90eca77
Suprabh Shukla [Thu, 2 Feb 2017 23:19:12 +0000 (23: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
Change-Id: I6cfa97f2f4fd113cafcca5440eafd6c5bf70698b
Suprabh Shukla [Thu, 2 Feb 2017 23:18:07 +0000 (23:18 +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
Change-Id: I75d702680bc6ef22e0f60a3c165cd310bf2bb6cf
Suprabh Shukla [Thu, 2 Feb 2017 23:17:06 +0000 (23:17 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
14ed611912 -s ours am:
051f01700e -s ours
am:
a3685e4bb5 -s ours
Change-Id: If22ee3dec4879f8324a66dea910bb65c9f6eda14
Suprabh Shukla [Thu, 2 Feb 2017 23:14:43 +0000 (23:14 +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
Change-Id: If9f0a189981a49d36662ad4e90d3278be35148d0
Suprabh Shukla [Thu, 2 Feb 2017 23:13:03 +0000 (23:13 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev am:
af85feef36 -s ours
am:
d9c8155943 -s ours
Change-Id: I9dfff7471440739580e7827cdb4484fad6900048
Suprabh Shukla [Thu, 2 Feb 2017 23:12:32 +0000 (23:12 +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
Change-Id: I336ce9f979c74df32ea80cd43253485ce184d0c0
Suprabh Shukla [Thu, 2 Feb 2017 23:12:05 +0000 (23:12 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am:
14ed611912 -s ours
am:
051f01700e -s ours
Change-Id: Idcf3ce991369a6e41a3c2bd3aa9cd16d909eea13
Suprabh Shukla [Thu, 2 Feb 2017 23:11:34 +0000 (23:11 +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
Change-Id: Idf95cea3331afbab3f6c69ced3341a7fa1dac2e1
Suprabh Shukla [Thu, 2 Feb 2017 23:10:10 +0000 (23:10 +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
Change-Id: I4b7d8869ecb9f1d8a52a0cccf59f8dee1f6c31dc
Suprabh Shukla [Thu, 2 Feb 2017 23:07:36 +0000 (23:07 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
am:
af85feef36 -s ours
Change-Id: Idf57ddf932e98dda06ac9c51f7e230d6a673882b
Suprabh Shukla [Thu, 2 Feb 2017 23:07:34 +0000 (23:07 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am:
14ed611912 -s ours
Change-Id: I1645d15febdfffd76cd2c592241549c507db1185