tree ddd9640e1f65162c3c53c05624df2a09b2f6a870
parent faa702dca81afa700dddaa01b2a73774085db515
parent fcf249b51cf7bd7d26ac1a65d5d5267fa60c4e9c
author Michael Jurka <mikejurka@google.com> 1319680038 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1319680038 +0000

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

* commit 'fcf249b51cf7bd7d26ac1a65d5d5267fa60c4e9c':
  Asset updates