tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent e8a4ea2bd5e593a9192d1511d047e582eaced2ec
parent 1ddfd2829a96d45d4c590518e699ba7f3f3bc507
author Chris Warrington <cmw@google.com> 1440711363 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711363 +0000

am 1ddfd282: am bbce9f33: (-s ours) am ab21bbf1: am 3001f7b2: Merge "Add thead pool size gradle property." into studio-1.4-dev automerge: 151fa7a automerge: 30f6731

* commit '1ddfd2829a96d45d4c590518e699ba7f3f3bc507':