Updated dependency to Android Gradle plug-in 0.12.0.

Change-Id: I01576649ec2b92a72cf4b569b512253f63b93184
Preview => Beta

Change-Id: Ic4de31ad7ec6b1a7cc3d367a4b050dad9bf50bb7
Merge "Preview => Beta" into idea133
Merge "Updated dependency to Android Gradle plug-in 0.12.0." into idea133
am fdcf5fd9: Merge "Updated dependency to Android Gradle plug-in 0.12.0." into idea133

* commit 'fdcf5fd9cca469c18af8e18aa15cb98eb7bf7ce3':
  Updated dependency to Android Gradle plug-in 0.12.0.
Make the default update channel search for updates "beta" instead of "release"

Change-Id: I617861f1172819a1e433b1bbca1d28bccec39949
Merge "Gradle: fix compatibility with Gradle 2.0 (cherry picked from commit 84cd616)" into idea133
Merge "Gradle: war facet web roots importing fixes - IDEA-126544 Gradle WAR: Empty directories in 'war' are not included during import IDEA-126545 Gradle WAR: Resource directory in 'war' with 'into' closure not imported (cherry picked from commit ba1bfd0)" into idea133
Merge remote-tracking branch 'aosp/upstream-133' into merge

Conflicts:
	plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectImportNotificationListener.java
	plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/builder/ModelBuildScriptClasspathBuilderImpl.java

Change-Id: I65895b6e2782c21c941314fc9e3b7bb5f070a7d3
Merge "Merge remote-tracking branch 'aosp/upstream-133' into merge" into idea133
Snapshot idea/135.1146 from git://git.jetbrains.org/idea/community.git

a0a2dd4: diff: do not show 'contents identical' if we can't calculate diff
512e3d2: diff: do not show 'No changes' panel when 'Can not show diff' should be shown
b9cea2d: Ruby plugin 6.5.2.20140512 marked as incompatible
e0b424b: cleanup partially initialized state by closing opened files if exception is thrown from storage constructor
fc31e05: include jfxrt.jar in classloader to load SceneBuilder
ac30822: JavaFx SceneBuilder b-14 fix
8e50987: platform: WM patching fixes
37218f8: module-level 'nekohtml' library replaced by reference to project-level library (cherry picked from commit 969da5b)
8f42ffc: Cleanup (warnings)
44e2358: IDEA-126353 (ignore AWT splash errors)
0d4e6e3: restore Find Jar working with malformed html (use nekohtml) (cherry picked from commit 135ed89)
2fc60c2: Gradle tooling tests: minor update to check compatibility with gradle v1.12 version instead of 1.12-rc-1
75a6acd: Gradle: fix build classpath resolve when 'classpath' configuration is in not unresolved state already (cherry picked from commit d38f95c)
5792e2f0: Gradle: do not wait for virtual file during project import for building of Navigatable object
97bc822: mass cherry-pick of Search Everywhere fixes
2608bbc: Can't find action by abbreviation after restart
d8fd041: EA-57395 Github: read from read action (cherry picked from commit 18614d9)
33ddbd1: Merge branch '135' of git.labs.intellij.net:idea/community into 135
5c07290: style: Hg Update Project Dialog
bb4fe72: IDEA-118400 Update Project dialog  redesigned, IDEA-106435 ability to perform only update, IDEA-75768 checks saved for Update dialog
87b3eb9: NPE
0b772f8: Don't format shebang only in first line of the script. Don't format comments that start with : and #.
7cd37d2: Fixed shebang formatting (PY-12775).
7ec7535: Added ability to pass command-line args to Gradle on project sync/refresh.
ea27f6c: 3.4.1
d324bd0: fixed PY-13177 PyCharm hangs on adding incorrect interpreter (python3-pyinotify)
c1f2eac: an internal inspection checking that virtual files are compared with "equals"
a2dd07c: EA-55292 (NPE fixed)
c83e88e:  fix thread crash in debug console after syntax error (PY-12600)
56d7f22: Merge remote-tracking branch 'origin/135' into 135
11611c9: Offer to launch vagrant on skeletons generation in popup balloon.
0279efe: Don't show modal dialog about vagrant start from packages list (PY-12838).
efbb395: Don't ask to start Vagrant in a modal dialog on skeleton generation (PY-12838).
50a6bc6: fixed PY-13150 Pyramid run configuration fails when specifing '--reload' in additional option
2db9a05: reuse LocalQuickFix because several instances can be handled badly (cherry picked from commit 6f417af)
2d06620: implement equals and hashCode to make two LocalQuickFix instances equal if they refer to one and the same IntentionAction (cherry picked from commit 26af3f5)
105cba7: don't hold reference to PsiFile (cherry picked from commit 89905f6)
f9114ae: WEB-12348 Quick fixes not always working in Inspection window (cherry picked from commit 769a599)
5dba8d6: IDEA-125649 (cherry picked from commit 707e584) [r=Maxim.Mossienko]
58cc562: IDEA-125397 Cyclic Expand Word no longer completes numbers (cherry picked from commit 3f7f1c1)
22669c4: IDEA-77640 Warn if the current subscription license will not work with the new version in the Update Info dialog (cherry picked from commit 1080da4)
32991e8: IDEA-119640 Problem with goto declaration of XML attribute defined in XSD (cherry picked from commit c2ad3ae)
3c55e17: IDEA-125462 Unable to execute simple platform test with IDEA Ultimate Plugin SDK (cherry picked from commit 57f4bbf) CR-IC-5548
3457099: IDEA-123189 Project wizard: tree entries text cutoff (cherry picked from commit 4559c7f)
75d4aad: several fixes from trunk cherry-picked
7cc642f: update Couple from trunk
77a9706: IDEA-116057 second-keystroke popup
48d90b3: IDEA-107350 EvaluateXPath dialog: input field height is too small, text is unreadable
13e2ed1: invalidate cashes stats
0169dee: app start stats
2e34400: IDEA-125421 diff tool opens wrong file if VCS file deleted via file system (cherry picked from commit 05b53b7)
c9796ee: domFileElement.isValid
3387a81: IDEA-118714 Problem in automatically changing branch on tasks switching (cherry picked from commit 16906b2)
26d6994: IDEA-125684 appearance of JTextField component in disabled state (cherry picked from commit 05e2292)
c0e8443: cleanup (cherry picked from commit 1fc11e7)
c6609f0: IDEA-125500 Terminal is not locale aware (cherry picked from commit 4660916)
6408e7a: batching tasks to reduce the number of events posted to EDT
bcdd38d: making sure all posted tasks are processed even after process terminated and dispose called by using sequential task executor instead of MergingUpdateQueue (IDEA-120167 Phantom eternal Ant task on make)
946ad53: quote parameters if win command processor launched with extra switches (e.g. /D) (cherry picked from commit 40420a0)
5d4c624: Fixed bug where Gradle settings were not updated on each project sync.
b645505: Revert temporary fixes.
5244f2f: Temporary fix to build plugin.
ed92e9f: Merge remote-tracking branch 'origin/135' into 135
ad8a031: Temporary fix to build plugin.
7ce288d: GPUB: backport Grammar-Kit 1.1.8  API, backward compatibility preserved.
1d73014: Tips added (PY-12484).
ef72c1f: Tips updated (PY-12982).
ba08817: Gradle: handling of project build classpath resolving errors related issues: http://youtrack.jetbrains.com/issue/IDEA-125592 http://youtrack.jetbrains.com/issue/IDEA-124839 (cherry picked from commit 36e275f)
33c32e0: Gradle: discover local gradle sdk sources local gradle dependencies (cherry picked from commit 519d350)
46b912a: Gradle: extra tooling model build error builder added (cherry picked from commit 37c2e28)
b707ed4: Gradle: tooling version updated in libLicenses.gant (cherry picked from commit fd6d2fa)
24b9320: IDEA-124839 Gradle sync reports "Error:You can't change a configuration which is not in unresolved state!" and "Could not resolve all dependencies" (cherry picked from commit 5991df3)
3b1d9e0: Use union of types of members as iteration type for tuples
c9c796c: Interpret tuple default parameter value as a weak type (PY-10967)
ed5ae9b: PY-12981 django apps don't resolve when INSTALLED_APPS is set with '+='
fbc626c: Nullity annotations and explicit TypeEvalContext for PyUnionType.excludeNull()
723333c: Cleanup
cb39cac: Don't suggest Python live templates inside parameter list (PY-12395)
5ae9900: Don't suggest Python live templates in string literals (PY-12349)
6cbcda2: Don't suggest Python live templates in comments (PY-13076)
536e1f5: Use 'Python' context for 'super' live template (PY-13080)
1c2f578: PY-11592 Django 1.6: TEMPLATE_DIRS variable in settings.py is not created properly on project creation
c066c53: Gradle: Added output folders to ModuleExtendedModel.
f27c6c1: IDEA-121687 New module->Ruby on Rails doesn't allow to specify sdk IDEA-121685 New module->Ruby has confusing UI (cherry picked from commit dbe0fc8)
0f4b682: IDEA-125262 Can't create Django, AppEngine and other specific Python projects (cherry picked from commit 68f0af6)
a6eec9f: introduced pycharm_load_entry_point instead of searching for executable through local file system
5937dd0: PyCharm 3.4 artwork. (cherry picked from commit 1316de2)
19bfb46: Fixed false positive for 'yield' expressions in lambdas (PY-11663)
65e58cc: Fixed false negative for 'yield' expressions in default values of parameters
d3469b4: Cleanup
a78c285: reverted 47fc79d09ef2793cd5fcc468d1fe7454bc5e4265
60970bf: fixed PY-12970 Extract variable: disable refactoring for parts of comrehensions
7f9b518: Merge branch '135' of git.labs.intellij.net:idea/community into 135
081064e: IDEA-123691 Minor project wizard edits: moving settings to the first page (cherry picked from commit 8aab4ce)
9959d98: PY-12734 Templates in app directories not found with implicit TEMPLATE_LOADERS
af057ed: Specify HTTP URL scheme for proxy string passed to 'pip' (PY-12771)
5c50075: PY-13018 ForeignKey to model in different file brakes backward references if referenced as APP_NAME.Model
3a7aab8: Package info with links to confluence added
8ff9dfb: PY-2980 Unresolved reference for ForeignKey defined as string
5362159: PY-12810 "imported" urls are not supported by {% url %} tag ( "patterns +=" now supported)
f2770ef: Merge remote-tracking branch 'origin/135' into 135
7a061a7: Gradle: ExtendedBuildModel now exposes the project's build directory.
93e4360: Turn off EAP flag.
d191d9d: don't access disposed excluded entry (IDEA-120622 workaround)
ad2b7e4: [git] IDEA-125328 Don't crash if commit/author time is empty
7da508e: Fix CME in terminal (IDEA-125398).
c087cd6: Revert moving starting script to settings.
3c5c225: Don't draw terminal content out of the terminal panel component (IDEA-125317).
4147d32: Don't draw terminal content out of the terminal panel component (IDEA-125317).
dee5fb4: Fixed scrolling issue in terminal (IDEA-125223).
1958b7c: Merge remote-tracking branch 'origin/135' into 135
e1920aa: cosmetics
a23fb97: Fixed conversion.
cc67bd7: IPython should be enabled by default.
debf5eb: Fix option label text and size.
0937a1b: No need to inform about failure.
4a91ce8: fixed literal conversion.
7f477cc: move console startup commands to Starting script field in Python Console settings (PY-11728)
9da26bc: add checkbox for disable IPython in Console settings (PY-7425)
e5bd4df: Merge remote-tracking branch 'origin/135' into 135
b7fc56c: Fix twice cherry-picked.
57062d8: jediterm updated to fix IDEA-125385
2b9db9b: fixed PY-12405 --noinput option does not work when running django unit tests
17fea2a: IDEA-123074 Code formatting. Closing brace. [CR-IC-5198] (cherry picked from commit 0c4028d)
202702a: Calculate dunderAll in stubs only if file text contains __all__.
1368b96: Extract deprecation warnings only if they present in text.
1f9b47e: Calculate future feature only if it present in text.
6928ed1: Calculate dunderAll in stubs only if file text contains __all__.
a18d752: fixed PY-12970 Extract variable: disable refactoring for parts of comrehensions
928d2fb: Updated JavaScript and CoffeeScript colors
90ba10c: Updated Buildout, GQL, ReST and YAML colors
a337b57: Updated Django and Mako templates colors
eaa537b: Updated CSS, LESS and SASS colors
e460a96: Updated HTML and XML colors
02a20da: Updated default colors and set many Python styles to inherited
cd6b6e5: Sorted options
5f181a7: fixed PY-12991 Missing Added by user mark on paths added to the interpreter
5b28080: Addede GitHub color scheme
1ea0102: Revert start_new_thread override.
47f0af7: Code clean-up.
9d4f4f0: IJ 13.1.4
7b2f992: IDEA-124032 IDEA plugin: Can't find com.sun.xml.internal.messaging.saaj.soap.LocalStrings bundle: allow bootstrap resources for root IDEA classloader (cherry picked from commit 8231d80) [r=Maxim.Mossienko]
b0720a3: include build target info in error message for unexpected errors
da5c497: ignore 'winShellScriptingQuoting' test if not Windows (cherry picked from commit 77e2c15)
ffedaea: quote param containing ampersand for .bat files (cherry picked from commit 3ce7f95)
751db99: Based on comments for http://crucible.labs.intellij.net/cru/CR-IC-5400 * quote param containing ampersand for .bat exe files * improve test to actually execute .cmd/.bat files (cherry picked from commit 0008feb)
76b0930: typo (cherry picked from commit 1fe1440)
df06b5b: WEB-12199 Grunt tool window fails to load Gruntfile tasks, when an "&" is in the path (cherry picked from commit d7f2104)
801467b: EA-56779 - IVFAE: PersistentFSImpl.getFileId (cherry picked from commit e4f6aa4)
5efa0d5: set explicit locale environment: GeneralCommandLine.getCharset() and LC_CTYPE should be the same, remove dependency on project and application default encodings (cherry picked from commit 095153a)
71fd5b7: IDEA-123691 Minor project wizard edits: moving settings to the first page (cherry picked from commit 86e8dd8)
8e3461f: IDEA-124593 (Inspection "AutoCloseable used without try-with-resources" flags System.out.printf) (cherry picked from commit 3b4ad30)[CR-IC-5278]

Change-Id: I7a6e75372ecb7cdcf304e3946a7e31c7f7306014
Gradle: fix compatibility with Gradle 2.0
(cherry picked from commit 84cd616)
Gradle: war facet web roots importing fixes -
IDEA-126544 Gradle WAR: Empty directories in 'war' are not included during import
IDEA-126545 Gradle WAR: Resource directory in 'war' with 'into' closure not imported
(cherry picked from commit ba1bfd0)
Gradle: Tooling API libs upgraded up to 2.0
Merge "Gradle: Tooling API libs upgraded up to 2.0" into idea133
Snapshot idea/135.1228 from git://git.jetbrains.org/idea/community.git

bed1fd2: IDEA-125129 I would like to reopen IDEA-117698: regression fixed (cherry picked from commit ce036b5)
f9f0908: avoid accessing invalid buffer (cherry picked from commit 0896a25)
74d4740: QL console: handle Throwable as well as Exceptions (cherry picked from commit bf9a9b8)
9b8d0d9: save "Download" checkbox separately; do not search empty strings (cherry picked from commit 13550c80624334bdae8cd13e3707448fb0a4624a)
e20188d: @NotNull'ed for EA-56831 - NPE: RemoteProcessSupport.release (cherry picked from commit e761dd8)
c78b2ec: License dialog: provide precise diagnostic for rejected key (IDEA-122894, IDEA-125916, IDEA-125917, IDEA-125921) (cherry picked from commit 40acdf7)
a7bb67d: backport: use one NonClasspathDirectoriesScope instead of union of per-root scopes
295b65a: backport: a more optimal ModuleWithDependentsScope construction with many exported entries
74d90e7:  introduced / used ValueIterator class to be able to get file set associated with given value without hash map lookup with m.b. costly hash code calculation (IDEA-125200)
ef38e3b: Gradle: out-of-process communication fix (cherry picked from commit fc0d011)
8ae8250: Gradle: Tooling API libs upgraded up to 2.0
61463c4: corrected heuristic covering more cases: considering failonerror attribute in ant tasks to treat messages fired with MSG_ERR priority as warnings. (IDEA-56227)
3557324: heuristic: considering failonerror attribute in ant tasks to treat messages fired with MSG_ERR priority as warnings. (IDEA-56227)
fcc212c: backporting migration to asm5
76d30e1: [by ann] migrating to asm5
873cbf6: IDEA-126598 Find in open files does not find occurrences in files outside of project (cherry picked from commit 8a4b153)
eac1eba: don't even schedule excluded files for update upon before contents changed events (cherry picked from commit 885a24d)
2e2532b: Gradle: war facet web roots importing fixes - IDEA-126544 Gradle WAR: Empty directories in 'war' are not included during import IDEA-126545 Gradle WAR: Resource directory in 'war' with 'into' closure not imported (cherry picked from commit ba1bfd0)
8a59c79: Gradle: fix compatibility with Gradle 2.0 (cherry picked from commit 84cd616)
e321f5a: [vcs] IDEA-122530 Fix deadlock in VCS instantiation
10a150f: @NotNull/Nullable

Change-Id: I16bae564961aaa854f8688ce70bf32cf43ae1dbf
Merge remote-tracking branch 'aosp/upstream-133' into merge

Conflicts:
	plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/WarDirectory.java

Change-Id: I4da578a27c29bb37e6c8d505bcd59664b406eae2
Merge "Merge remote-tracking branch 'aosp/upstream-133' into merge" into idea133
72680: Handle Studio settings upgrades more automatically

When you run AndroidStudioBeta or AndroidStudio for the first time, make the
import helper aware of our previous settings directory names (AndroidStudioPreview,
AndroidStudioBeta) such that it can default to suggesting an import location which
migrates the settings. Prior to this fix (which unfortunately meant this happened in
beta) users would simply be pointed to the /Applications folder on Mac (probably
something similar on other platforms) and if they had already replaced their preview
install with beta, it wasn't clear what to do.

Change-Id: If004f2b652df51f11f47622ea991a6dd01885af5
Merge "72680: Handle Studio settings upgrades more automatically" into idea133