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