76606: Disappearance of escapes, when use "Extract string resources"

Change-Id: I84d2ad89b9303828984da9ff3cdb01967b04b8cc
Tweak visual appearance of the translations-editor tip

Change-Id: I6081061cf5d6387d9c7c0d282de2e2eb3adedc63
Merge "Tweak visual appearance of the translations-editor tip" into studio-1.0-dev
Merge "76606: Disappearance of escapes, when use "Extract string resources"" into studio-1.0-dev
Merge "Tweak visual appearance of the translations-editor tip" into studio-1.0-dev
automerge: c14dbcc

* commit 'c14dbcc37d80e4f4b9f933870d5f087e84347d3e':
  Tweak visual appearance of the translations-editor tip
Merge "76606: Disappearance of escapes, when use "Extract string resources"" into studio-1.0-dev
automerge: a21768e

* commit 'a21768e84f76374424fcabb384862b5560be4d07':
  76606: Disappearance of escapes, when use "Extract string resources"
UI test for translations editor

This CL adds a simple UI test for the translations editor.

Change-Id: I86e3a744b6d53f89c0976581b7931b336be34bb7
Merge "UI test for translations editor" into studio-1.0-dev
Merge "UI test for translations editor" into studio-1.0-dev
automerge: c6ca049

* commit 'c6ca04972ebab7241165a9331b73d5afd0536db7':
  UI test for translations editor
Unit test for SdkMerger.

Bug: 76615
Change-Id: Idf9a3fe6ae47cac85b0003070025cefae66b9df9
Show regular welcome screen on wizard completion

Change-Id: I57733b3f145862415a321188423fbe8807b92059
Merge "Unit test for SdkMerger." into studio-1.0-dev
Merge "Unit test for SdkMerger." into studio-1.0-dev
automerge: 2e407d2

* commit '2e407d2afc80dcd85915556b220362539d69a61c':
  Unit test for SdkMerger.
Merge "Show regular welcome screen on wizard completion" into studio-1.0-dev
Merge "Show regular welcome screen on wizard completion" into studio-1.0-dev
automerge: 17bc462

* commit '17bc46204385c2fb661cdb91176bea6b0e6a0535':
  Show regular welcome screen on wizard completion
navigator: Tweak sorting of gradle scripts

This CL tweaks the order in which Gradle scripts are displayed.
Specifically, the scripts present inside modules are shown first.

Fixes https://code.google.com/p/android/issues/detail?id=76514

Change-Id: I672cad9d66799cce201ac17860194d4e951a98f4
Merge "navigator: Tweak sorting of gradle scripts" into studio-1.0-dev
Merge "navigator: Tweak sorting of gradle scripts" into studio-1.0-dev
automerge: 7c835a3

* commit '7c835a3de1ee57a41ab5125ab72e3ae33620cc35':
  navigator: Tweak sorting of gradle scripts
SplitOutputMatcher.computeBestOutput requires abis supported by variant.

This is a build fix CL. A recent change to tools/base changed the API
for SplitOutputMatcher by including an extra argument: a set of abis
supported by the current variant. Since we don't yet have that information
in the IDE model, this CL passes in an empty set for now..

Change-Id: Iced453f800e56b0cca9e08dada1fdaeb7fe8f21f
Merge "SplitOutputMatcher.computeBestOutput requires abis supported by variant." into studio-1.0-dev