Increased the memory settings for the IDEA configuration

Change-Id: I7af89707dff73521bc88a01d6c801e0f77c6648d
Merge "Increased the memory settings for the IDEA configuration" into idea133
Merge "move destination: fix laziness" into idea133
move destination: fix laziness
create class: filter out generated roots (IDEA-127562)
Merge "create class: filter out generated roots (IDEA-127562)" into idea133
distinguish generated roots during rename/move warnings (IDEA-125147)
Merge "distinguish generated roots during rename/move warnings (IDEA-125147)" into idea133
navigator: show android pane before scope pane

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

Change-Id: I2fda607414e742690ddd9afd41408d19858b69d3
Merge "navigator: show android pane before scope pane" into idea133
Snapshot idea/135.1272 from git://git.jetbrains.org/idea/community.git

f07050c: fix
918343d: remove hacks and introduce RightAligned toolbar actions (cherry picked from commit 9c7c637)
ccbe75a: make WeakStringInterner concurrent (cherry picked from commit 5414347785ae0827bdad488c823eff81a2c5148e)
95e7e88: don't hold all strings from all plugin.xmls forever
6c61e8a: fix compile
8001655: simplify matched condition (IDEA-128096) (cherry picked from commit 0b93c03) [r=Maxim.Mossienko]
f89e244: IDEA-128342 Tip of the Day window does not retain size (cherry picked from commit de86410) [r=Konstantin.Bulenkov]
1cc5555: [performance fix] check containing method to have at least the same name as method usage we encountered, to avoid resolving during hierarchy visiting for detecting delegation (IDEA-128264) (cherry picked from commit bf1f259)
5d2dcec: Problem with Turkish "I" character when searching case-insensitive (IDEA-70993) (cherry picked from commit a07da60) [r=Alexey.Kudryavtsev]
d687cb2: IDEA-127582 [Gradle] Web Resource Directory will be set to empty
f2b616f: Merge remote branch 'origin/135' into 135
2a76996: using the right api call to register compiled class (IDEA-128051 Groovy aspectj compilation)
8499fd0: fix compilation
68afac1: ModuleWithDependentsScope: walk dependency graph more carefully with respect to exported dependencies (cherry picked from commit 9400b89)
8dda1c1: remove too large file from files scheduled for update in after event: large file might be scheduled for update in before event when its size was not so large (cherry picked from commit 281bc7a) [r=Eugene.Zhuravlev]
6e1e000: touch file to recompile (cherry picked from commit 5972053)
f8ae2bf: attempt to fix IDEA-123132 Error: failed to create a child event loop
c51a768: we must avoid use UUID.randomUUID — can cause long network calls (cherry picked from commit 421efd0)
9158cb3: https://groups.google.com/forum/#!searchin/netty/netty$204.1/netty/8jf6SPFiN6g/nLg7opwUsxwJ
2626374: update grails project structure: remove proper instance of ContentEntry (IDEA-120622) using urls since ContentEntry uses default equals/hashcode implementation [rev by Peter]
06d32e7: Merge remote-tracking branch 'origin/135' into 135
fe96457: don't print exceptions
a8ec2a3: IDEA-127693 Grails create-app is not executed
8e6860e: CommentInjector: improved detection and IDEA-114915 InjectorUtils performance (cherry picked from commit 70c5d69a7c7ff80abefba629deaf26b1389f7dac)
cfc4df7: memory hogging on javaInjections.xml editing (cherry picked from commit dd23104)
5cb5ccb: IDEA-125414 DB keys/indices to columns navigation (cherry picked from commit e9e95238a6bf2164e50214193e4112e3b83c544b)
cb4c367: fix not-disposed errors on quit (cherry picked from commit 36db24a729cf5b0272cf34344ed97197dd2ac686)
435b39c: EA-57466 - ISE: Messages.getErrorIcon (cherry picked from commit c0ff0b1376a3e6f9a571f827661705344b7d04db)
20e9aa3: EA-56674 - IAE: DbFindUsagesHandlerFactory.canFindUsages (cherry picked from commit 6ef97d67eff5d6ebdf8a90ff6badd3afb77e873f)
903505c: larger code cache size + flag to enable code cache size flushing
12f4b29: IDEA-122701 IDEA doesn't start on Mac under one of the user accounts after patch update
25b3d2c: fix compilation against api of updated ecj compiler
8a4fe4f: on case-insensitive file systems perform file name compatibility check using real file names, not the ones taken from dynamically built or stored paths
4cd11a5: bundling ecj-4.4 java compiler
66ef9e0: skip non-java files with given word in literal even before retrieving text / searching the word / finding element at tree (IDEA-126201) (cherry picked from commit 067aa19)
d991868: catch exception when writing content, marking vfs for rebuild (IDEA-125925) (cherry picked from commit 68c651e)
a9946ef: 13.1.5, if we will need
bce54d1: java: parser changes temporarily reverted
6d8a2b1: IDEA-127077 (incorrect parsing of type annotations)
c6d2f90: Cleanup (warning)

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

Conflicts:
	build/scripts/tests.gant

Change-Id: I951abe701c24ce8e6fd07d9d502f69eaaae95b72
Merge "Merge remote-tracking branch 'aosp/upstream-133' into merge" into idea133
Remove defunct library gradle-import

Change-Id: Ice92249f71d1ca204883632355a40af06bb0f183
Merge "Remove defunct library gradle-import" into idea133
73999: Corrupt installation: Still contains android-designer bits

Change-Id: I33ce74f7b61423f0c7e63db1d5ebad01c8ffc2ff
(cherry picked from commit 5416bb1377d39bd78882d44bf1369f327de7ac70)
Merge "73999: Corrupt installation: Still contains android-designer bits" into idea133-milestone