tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent 3a365d197a34b285fce81cf407132d233031dd46
parent 78a66e6ff79f1d07fc54a28946eae7de25c8e0ff
author Xavier Ducrohet <xav@google.com> 1440711409 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711409 +0000

am 78a66e6f: am ceaf151a: (-s ours) am 9595965e: am b6f59e35: Merge "Add thead pool size gradle property." into studio-1.3-dev automerge: 54de167  -s ours automerge: e6ff7a9 automerge: afc49c9

* commit '78a66e6ff79f1d07fc54a28946eae7de25c8e0ff':