| commit | aca11c0cf401147a075f72f110e0e27336066127 | [log] [tgz] |
|---|---|---|
| author | Chet Haase <chet@google.com> | Fri Sep 17 15:55:11 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 17 15:55:11 2010 -0700 |
| tree | 93fff928832b39e83f5dea344beec27fea5d6ce9 | |
| parent | 5e87e0d07dd909535b3a78b5fec8b544324b2c90 [diff] | |
| parent | 6dcffb434fff42b956b604e24a5b5728e721b686 [diff] |
am 6dcffb43: (-s ours) am 4a2b3ef1: Merge "new assets" into gingerbread Merge commit '6dcffb434fff42b956b604e24a5b5728e721b686' * commit '6dcffb434fff42b956b604e24a5b5728e721b686': new assets