| commit | 93bdfa94e429feda279edccc091c64477c92b09c | [log] [tgz] |
|---|---|---|
| author | Tenghui Zhu <ztenghui@google.com> | Thu Aug 27 21:37:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 21:37:50 2015 +0000 |
| tree | ff5bf30242ff444d41cfeb257d4914bb38905b2e | |
| parent | 7797b0f537b2d8244486b98e9a55381e40351f55 [diff] | |
| parent | 1bbdea2a38342d8b6632e865de62039e3275092e [diff] |
am 1bbdea2a: am 631f8a79: (-s ours) am 5ae28008: am ca2acd80: Merge "Move the vector drawble conversion/preview library from asset lib to sdk-common" into studio-1.4-dev automerge: 148edb3 automerge: a8bf03b * commit '1bbdea2a38342d8b6632e865de62039e3275092e':