tree e52f928de9a6829f9ac8752d59d6ed933677e8cd
parent 35d586c172a91fa7c64be36f696dff74e5555a3e
parent b00f3e4ff96fd31d46a1aa78bc20fefda4d5e305
author ztenghui <ztenghui@google.com> 1437167757 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437167757 +0000

am b00f3e4f: am fcec0638: am 8b455841: am 094c82ad: Merge "Scaling (Animated)VectorDrawable inside ImageView" into mnc-dev

* commit 'b00f3e4ff96fd31d46a1aa78bc20fefda4d5e305':
  Scaling (Animated)VectorDrawable inside ImageView