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

* commit 'fcf249b51cf7bd7d26ac1a65d5d5267fa60c4e9c':
  Asset updates
This commit is contained in:
Michael Jurka authored and Android Git Automerger committed 2011-10-27 01:47:18 +00:00
commit cea7ac9a1d

Diff Content Not Available