| commit | e8fbb7e679b38c1e6661fcfaa64e0145ca8e5d97 | [log] [tgz] |
|---|---|---|
| author | Michal Bendowski <bendowski@google.com> | Thu Aug 27 12:13:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 12:13:54 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | ab5adb9b88475d85a98f546593a91c28a2abe7ff [diff] | |
| parent | 957e0f97abb686c9128d25cbbc4fa6dac2eecf5a [diff] |
am 957e0f97: (-s ours) am ffeb414f: am a75040a3: Merge "Introduce AndroidGradleOptions" into studio-1.4-dev automerge: 5bb7448 automerge: 28ebb26 * commit '957e0f97abb686c9128d25cbbc4fa6dac2eecf5a':