| commit | 7d99d81182adacbb11e2bf200f70aa0e15ef2e55 | [log] [tgz] |
|---|---|---|
| author | Alex Ruiz <alruiz@google.com> | Thu Aug 27 11:15:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:15:41 2015 +0000 |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | fe039e6af9c52ecbc9e01c3caca808e7ffc489a7 [diff] | |
| parent | 88abb20ec2bee9c217b01d53fff2d3ba2a7b4a0b [diff] |
am 88abb20e: (-s ours) am eff6b9a0: am d9502968: Merge "Migrate some clients to getMainArtifact." into studio-1.4-dev automerge: cb4c135 automerge: b97d32c * commit '88abb20ec2bee9c217b01d53fff2d3ba2a7b4a0b':