tree e8787c45e494dfcc558faf0f75956f8785c39b94
parent e222a9e1e66670a56e926a6b0f3e10231eeeb1fb
parent e782c57d74000722f9db4c9426317410520670c6
author Tor Norbye <tnorbye@google.com> 1411072738 -0700
committer Tor Norbye <tnorbye@google.com> 1411072738 -0700

Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/libraries/asm_tools.xml
	.idea/libraries/bouncy_castle.xml
	.idea/libraries/builder_model.xml
	.idea/libraries/commons_compress.xml
	.idea/libraries/easymock_tools.xml
	.idea/libraries/freemarker_2_3_20.xml
	.idea/libraries/guava_tools.xml
	.idea/libraries/kxml2.xml
	.idea/libraries/lombok_ast.xml
	.idea/libraries/mockito.xml
	.idea/modules.xml
	.idea/vcs.xml
	build/scripts/layouts.gant
	updater/src/com/intellij/updater/Runner.java

Change-Id: I8e1c173e00cd76c855b8a98543b0a0edfdd99d12