am bd3cb833: am 6f534944: (-s ours) am 47941410: am dd1004df: Merge "181820: Android Gradle plugin 1.3.0 breaks lint html reporting" into studio-1.3-dev automerge: 6b4c635 automerge: 9e220c9 automerge: 557fdcc

* commit 'bd3cb833684e868dbcb99526be6737f83bf5bc55':