tree 63bf4ba0d9a947e50124770894d796ac0d93620c
parent 465cda9256bcdcc9f9119e9a1a2ada305b1392ae
parent f51846147d400c40dae2fbffc42b9868b35915e5
author Ficus Kirkpatrick <ficus@android.com> 1392038980 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392038980 +0000

am f5184614: am 6358cb08: Merge "Add a basic test for NetworkImageView"

* commit 'f51846147d400c40dae2fbffc42b9868b35915e5':
  Add a basic test for NetworkImageView