diff options
| author | Tenghui Zhu <ztenghui@google.com> | 2015-08-27 21:59:18 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 21:59:18 +0000 |
| commit | 7736435382a082f71d8d62ea8593984a5e76127b (patch) | |
| tree | be637547c725febd189f8b263693db6557ddaa7d | |
| parent | 9ae34dc6729868f3766973186ceb08fe01f821a1 (diff) | |
| parent | 4afa0a6eb4d0af831daee11d61a84c6317486e94 (diff) | |
| download | idea-7736435382a082f71d8d62ea8593984a5e76127b.tar.gz | |
am 4afa0a6e: am 80b98355: (-s ours) am 40bd19bc: am 7eb0a966: Merge "Move the vector drawble conversion/preview library from asset lib to sdk-common" into studio-1.4-dev automerge: 9115474 automerge: bc4faaa
* commit '4afa0a6eb4d0af831daee11d61a84c6317486e94':
0 files changed, 0 insertions, 0 deletions