tree 15aed3af05bd7236c56c069f23042c846b6a73d6
parent c268c442a154800c0a2fd3199fa4798b3dbb284c
parent e6bbcaf0bc010563c1c65f51ff4610a7bde26609
author Jeff Sharkey <jsharkey@android.com> 1378501234 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378501234 -0700

am e6bbcaf0: Merge "Another asset drop, provider icons, tests." into klp-dev

* commit 'e6bbcaf0bc010563c1c65f51ff4610a7bde26609':
  Another asset drop, provider icons, tests.