6 lines
2.8 KiB
Plaintext
6 lines
2.8 KiB
Plaintext
<<<<<<< HEAD
|
|
<Devices><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:2</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:3</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:3</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86_64</ResultingAbi><ToolsAbi /><SdkVersion>33</SdkVersion><LongOutput>product:sdk_gphone64_x86_64;model:sdk_gphone64_x86_64;device:emu64x;transport_id:2</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86_64</ResultingAbi><ToolsAbi /><SdkVersion>33</SdkVersion><LongOutput>product:sdk_gphone64_x86_64;model:sdk_gphone64_x86_64;device:emu64x;transport_id:3</LongOutput></Device><Device id="LGH8706e8e61fd"><ResultingAbi>arm64-v8a</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:lucye_global_com;model:LG_H870;device:lucye;transport_id:3</LongOutput></Device></Devices>
|
|
=======
|
|
<Devices><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:2</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:3</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:3</LongOutput></Device><Device id="64504bda"><ResultingAbi>arm64-v8a</ResultingAbi><ToolsAbi /><SdkVersion>30</SdkVersion><LongOutput>product:davinci_eea;model:Mi_9T;device:davinci;transport_id:5</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:1</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:1</LongOutput></Device><Device id="emulator-5554"><ResultingAbi>x86</ResultingAbi><ToolsAbi /><SdkVersion>28</SdkVersion><LongOutput>product:sdk_gphone_x86_arm;model:AOSP_on_IA_Emulator;device:generic_x86_arm;transport_id:1</LongOutput></Device></Devices>
|
|
>>>>>>> origin/master
|