tree ff5bf30242ff444d41cfeb257d4914bb38905b2e
parent bc819ac857a53fac54ceb2aab824ce071a8c6ee3
parent e8fbb7e679b38c1e6661fcfaa64e0145ca8e5d97
author Michal Bendowski <bendowski@google.com> 1440711376 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440711376 +0000

am e8fbb7e6: am 957e0f97: (-s ours) am ffeb414f: am a75040a3: Merge "Introduce AndroidGradleOptions" into studio-1.4-dev automerge: 5bb7448 automerge: 28ebb26

* commit 'e8fbb7e679b38c1e6661fcfaa64e0145ca8e5d97':