commit | cea7ac9a1dfcb2685125c2b6250dae8c2b934139 | [log] [tgz] |
---|---|---|
author | Michael Jurka <mikejurka@google.com> | Thu Oct 27 01:47:18 2011 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 27 01:47:18 2011 +0000 |
tree | ddd9640e1f65162c3c53c05624df2a09b2f6a870 | |
parent | faa702dca81afa700dddaa01b2a73774085db515 [diff] | |
parent | fcf249b51cf7bd7d26ac1a65d5d5267fa60c4e9c [diff] |
am fcf249b5: (-s ours) Merge "Asset updates" into ics-mr0 * commit 'fcf249b51cf7bd7d26ac1a65d5d5267fa60c4e9c': Asset updates