OSDN Git Service

android-x86/frameworks-base.git
7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad711...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad711...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad711...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d9098284...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306 am...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115 am...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d am: d819c2386b
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad711...
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours am: 4d90982846
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: b18bd06e94 am: 9434773306
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65 am: 3da69c1115
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev am: 0354b89d31
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev am: 1f007d...
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev am: 7115ad7119
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 3e2652a55d
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: 021747a076 -s ours
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: b18bd06e94
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

7 years agoDO NOT MERGE. No direct Uri grants from system. am: bac46f5b65
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

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-dev
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

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into nyc-dev
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

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-dev
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

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-dev
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

7 years agoDO NOT MERGE. No direct Uri grants from system.
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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr-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

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into mnc-dr1.5-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

7 years agoMerge "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-dev

7 years agoMerge "DO NOT MERGE. No direct Uri grants from system." into nyc-mr1-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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 14ed611912 -s ours
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
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

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held
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

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 23:06:08 +0000 (23:06 +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

Change-Id: I3d09ae3d8683f9f4a2c68321eb4fdd9490c9355b

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 23:05:10 +0000 (23:05 +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

Change-Id: Ie6d665f3cb2aae6e8043b4bde28005a2aaa94953

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 23:05:09 +0000 (23:05 +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

Change-Id: I7dcba06623c993f0539729be69d97d338be2393f

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 23:03:17 +0000 (23:03 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb am: ecadb9d7cb
am: f565a487bb

Change-Id: Ia8861b784be1b25dae59cea5b2eb288ec739e346

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 23:01:14 +0000 (23:01 +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

Change-Id: I4f5ae380b111b21838744c83eda1e3772d705692

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 23:00:10 +0000 (23:00 +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

Change-Id: I903e7a49df102aaa442cfb49040cd99bb2e7f0f2

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 23:00:07 +0000 (23:00 +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

Change-Id: I112366734c02695d69251e159fb97c523a9c0cf4

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev
Suprabh Shukla [Thu, 2 Feb 2017 22:58:45 +0000 (22:58 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-dev

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 22:56:23 +0000 (22:56 +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

Change-Id: I1cfa1298cf0a1f4f53358242d639ff7f072bc273

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:56:15 +0000 (22:56 +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

Change-Id: I2d8425f5da49ba7b1bd451f9ce5e15cfd423b7eb

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:55:10 +0000 (22:55 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1 am: 73056d5feb
am: ecadb9d7cb

Change-Id: I85221b6dc0097893ec6d5d3fbbe09d549ecc1b18

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 22:55:08 +0000 (22:55 +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

Change-Id: Ie8ed7d0a8f45d4ad2ccd9f0db56499aa492b8cb8

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:51:09 +0000 (22:51 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6 am: 37d3b12aa1
am: 73056d5feb

Change-Id: Id542f20e2e11baae9b6281af86d8f0dbe12d08b3

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 22:50:32 +0000 (22:50 +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

Change-Id: I065ff3640f19985157cd63c529019167c135489a

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:49:26 +0000 (22:49 +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

Change-Id: I6594a2922340e20d226752f0b4a1e99aed7448cb

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 22:48:34 +0000 (22:48 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1  -s ours am: 3a09dac9c4 am: 50c6d2ff56
am: db40505c42

Change-Id: I97bba19262c03c223faf56505534c29f603d7671

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:45:43 +0000 (22:45 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69 am: fab95f8ad6
am: 37d3b12aa1

Change-Id: I751c29efc17d371905f5d70460e65744c63ec1fc

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d...
Suprabh Shukla [Thu, 2 Feb 2017 22:45:36 +0000 (22:45 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b am: b278ed787e  -s ours
am: ec3e2b9dcb  -s ours

Change-Id: I76bf4d69d98374a90da3cd4c74f0c2d892504a40

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:43:58 +0000 (22: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

Change-Id: I4998929bae9f510de4dc5828e136921a033ff98e

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 22:43:00 +0000 (22:43 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1  -s ours am: 3a09dac9c4
am: 50c6d2ff56

Change-Id: I53ba07ec6cfa0c8617eae87a671d292a6b28f519

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b
Suprabh Shukla [Thu, 2 Feb 2017 22:41:38 +0000 (22:41 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a am: 21992d997b
am: b278ed787e  -s ours

Change-Id: Ib70440bdd1c60ed5eaa9b8c8152a4745f44cacd6

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:41:34 +0000 (22:41 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746 am: 426f454b69
am: fab95f8ad6

Change-Id: I7c8ac34bfb4bf1bcf6323163ef872d83ee58bfcc

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:39:22 +0000 (22:39 +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

Change-Id: Ib5e1e997168d33810e36510bebe6783382211059

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d...
Suprabh Shukla [Thu, 2 Feb 2017 22:38:31 +0000 (22:38 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69 am: c22e6d15d1  -s ours
am: 3a09dac9c4

Change-Id: I7c001da58aee7ea4784a8fb8c8a2a2498bfba533

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b1...
Jack Yu [Thu, 2 Feb 2017 22:36:03 +0000 (22:36 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10 am: 413922e746
am: 426f454b69

Change-Id: I063d17c3eeb6f5b6ec32c261b22ccea273c572ea

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a
Suprabh Shukla [Thu, 2 Feb 2017 22:36:03 +0000 (22:36 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 8cdc04957a
am: 21992d997b

Change-Id: Ib5ba5eb63227be2fbf25a79e7f8f8e42b1cc9a2b

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1...
Suprabh Shukla [Thu, 2 Feb 2017 22:34:55 +0000 (22:34 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev am: 3ced78bdda
am: aec526f710  -s ours

Change-Id: I383f706dfc0690352c3b4d6358ed1269c15ed8b8

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69
Suprabh Shukla [Thu, 2 Feb 2017 22:34:02 +0000 (22:34 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held am: 835c8b3d69
am: c22e6d15d1  -s ours

Change-Id: I80fa5e3991464bf99111c00b1074a4e5c7ef9130

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10
Jack Yu [Thu, 2 Feb 2017 22:31:29 +0000 (22:31 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564 am: 40d0753b10
am: 413922e746

Change-Id: I8664d6e42113b4c22741b06780727b10c2e6804e

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held
Suprabh Shukla [Thu, 2 Feb 2017 22:31:29 +0000 (22:31 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 8cdc04957a

Change-Id: I7c1b9e9f785ef99575136d9af0b062dad759c17a

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
Suprabh Shukla [Thu, 2 Feb 2017 22:29:02 +0000 (22:29 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
am: 3ced78bdda

Change-Id: I4da6e2894de769fb028ad713290b62e38925294a

7 years agoDO NOT MERGE Do not call RecoverySystem with DPMS lock held
Suprabh Shukla [Thu, 2 Feb 2017 22:28:59 +0000 (22:28 +0000)]
DO NOT MERGE Do not call RecoverySystem with DPMS lock held
am: 835c8b3d69

Change-Id: I080d11d3d7d6434b832f8ecb1ee93c17a6d7cb4a

7 years agoFixed the logic for tethering provisioning re-evaluation am: 91a0bc9564
Jack Yu [Thu, 2 Feb 2017 22:26:09 +0000 (22:26 +0000)]
Fixed the logic for tethering provisioning re-evaluation am: 91a0bc9564
am: 40d0753b10

Change-Id: I1f8a897862c69a475c6d12a824bd69ed8692cd99

7 years agoMerge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev
Suprabh Shukla [Thu, 2 Feb 2017 22:23:08 +0000 (22:23 +0000)]
Merge "DO NOT MERGE Do not call RecoverySystem with DPMS lock held" into lmp-mr1-dev