tree 5951887f6d9e01d62f743d5d26f882231cf2efb8
parent a76265a439b8a0ff882143009726ce530beb271d
parent fcec06384d895c538e25326246c128b3120f3905
author ztenghui <ztenghui@google.com> 1437166846 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437166846 +0000

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

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