| commit | 3295d292863b2b8d01e798fcbb9e65f79b0e872c | [log] [tgz] |
|---|---|---|
| author | Raymond Chiu <chiur@google.com> | Thu Aug 27 21:37:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:34 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 5e91d01caf009a95d0a069d06a6d06ddc1912391 [diff] | |
| parent | cc300c62a28d9d419d901ed1771f01ee7ff78806 [diff] |
am cc300c62: am f461672e: (-s ours) am bf9c9ac7: am 4e78e952: Merge "Update to gradle 2.5" into studio-1.3-dev automerge: b65d578 automerge: 901efce automerge: c343969 * commit 'cc300c62a28d9d419d901ed1771f01ee7ff78806':