| commit | 06cd9298ee175bc45d83c73a25fb26b7f15d4814 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Aug 18 16:05:03 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 18 16:05:03 2010 -0700 |
| tree | 7b75c46004b807f9a00d6bd39a35f03add671a49 | |
| parent | 0c8300bccd4d1dfdf6b746d8d89ac526733f0181 [diff] | |
| parent | c70bdbc1eb32e81259dbb4a5c028efef354e9c54 [diff] |
am c70bdbc1: manual merge - fix build Merge commit 'c70bdbc1eb32e81259dbb4a5c028efef354e9c54' into dalvik-dev * commit 'c70bdbc1eb32e81259dbb4a5c028efef354e9c54': Cherry picking changes from dalvik-dev