tree e7e96033d6b5c7804875641fcefc47a27af9fe35
parent 94ba209ac0a20208bab7a236aa99a335f878c92a
parent cea7ac9a1dfcb2685125c2b6250dae8c2b934139
author Michael Jurka <mikejurka@google.com> 1319682910 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319682910 +0000

am cea7ac9a: am fcf249b5: (-s ours) Merge "Asset updates" into ics-mr0

* commit 'cea7ac9a1dfcb2685125c2b6250dae8c2b934139':
  Asset updates