| commit | aa1dabb8827b56b50477a321fb2e115585040794 | [log] [tgz] |
|---|---|---|
| author | Tor Norbye <tnorbye@google.com> | Thu Aug 27 21:32:28 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:32:28 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | ad63e6044e7f9781a1788cbee1628f2fa950ecd8 [diff] | |
| parent | 2f0cee5c3c1e688648a79c87c39dd4deb22cce53 [diff] |
am 2f0cee5c: am f18b6519: (-s ours) am c3c8a8b8: am 77a63622: Merge "178194: "Replace with specific version" quickfix not working in some cases" into studio-1.3-dev automerge: 3099d22 automerge: f9e62c9 automerge: 6b6e4c3 * commit '2f0cee5c3c1e688648a79c87c39dd4deb22cce53':