Merge "Fix report merger." into idea133
automerge: 21163bf

* commit '21163bf11ae6e53d76643847e97937f217d76fcd':
  Fix report merger.
Merge "Running tests with no test found will now break the build." into idea133
automerge: cbff0f5

* commit 'cbff0f570c4ac586f5c5f05d326338858db0fe3b':
  Running tests with no test found will now break the build.
am 291328d8: Merge "Use a NO_FILTER constant instead of null." into idea133 automerge: b30bd0c

* commit '291328d84a2f0bb54e7b89ac0f165e07bb05e8b6':
  Use a NO_FILTER constant instead of null.
am 2af0e1bb: Merge "Fix report merger." into idea133 automerge: 21163bf

* commit '2af0e1bb42a933ef7ddcb895f1be845e3a6bf2f0':
  Fix report merger.
am 7867067d: Merge "Running tests with no test found will now break the build." into idea133 automerge: cbff0f5

* commit '7867067d0e51ed2d88e41de0486b3fe951a7555d':
  Running tests with no test found will now break the build.
Merge "Fix simpleManifestMergingTask sample" into idea133
automerge: bd26c52

* commit 'bd26c5238874a1067e3e04b41bec77fb7c57b308':
  Fix simpleManifestMergingTask sample
am 7a0ba10e: Merge "Fix simpleManifestMergingTask sample" into idea133 automerge: bd26c52

* commit '7a0ba10e178d85e45e6915b3ef941503be7b7f5f':
  Fix simpleManifestMergingTask sample
Merge "Fix 3rdPartyTests by reporting fake test results." into idea133
automerge: abcc18a

* commit 'abcc18a7d6ec87ff55c6c948e276e588af5e7afa':
  Fix 3rdPartyTests by reporting fake test results.
Merge "Fix simpleManifestMerger to include clean task." into idea133
automerge: e5e5070

* commit 'e5e50705a88490f057d725c74e5a1dfd1197aa94':
  Fix simpleManifestMerger to include clean task.
am 145ee1e1: Merge "Fix 3rdPartyTests by reporting fake test results." into idea133 automerge: abcc18a

* commit '145ee1e11c46a338f7259b682c4f415fbe8ebeeb':
  Fix 3rdPartyTests by reporting fake test results.
am 12fa746c: Merge "Fix simpleManifestMerger to include clean task." into idea133 automerge: e5e5070

* commit '12fa746cbeefbc5d71fe1be941030771a269e348':
  Fix simpleManifestMerger to include clean task.
Update changelog for gradle 0.13.1

Change-Id: I4f8ccc873111d39517b0ebe238059382060b4de3
Merge "Update changelog for gradle 0.13.1" into idea133
Merge "Update changelog for gradle 0.13.1" into idea133
automerge: 965b208

* commit '965b2080cc40a9c1425c9029dfa88f84df9d0003':
  Update changelog for gradle 0.13.1
Merge "Fix lint HTML formatting: don't allow line breaks in URLs" into idea133
Merge "Fix lint HTML formatting: don\'t allow line breaks in URLs" into idea133
automerge: 16a7424

* commit '16a74241e5653f145f3b7b68ecd786dba2cb0597':
  Fix lint HTML formatting: don't allow line breaks in URLs
am eaac3ee9: Merge "Update changelog for gradle 0.13.1" into idea133 automerge: 965b208

* commit 'eaac3ee97b346d468e30a157cac2fdf5f6271ba7':
  Update changelog for gradle 0.13.1
am 5061410a: Merge "Fix lint HTML formatting: don\'t allow line breaks in URLs" into idea133 automerge: 16a7424

* commit '5061410a2b809a6fc078176a1fe0ca1b61d8c3d1':
  Fix lint HTML formatting: don't allow line breaks in URLs
Merge "Update changelog for gradle 0.13.1" into studio-1.0-dev
automerge: 0c0b445

* commit '0c0b445b43f971aa4d03bf4019961992f4f6f15e':
  Update changelog for gradle 0.13.1
Merge "move code to build gradle project to module." into studio-1.0-dev
automerge: 1228a9f

* commit '1228a9f1cb54d5d32c3157c6a1d2a80b31eebbe7':
  move code to build gradle project to module.