diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-20 19:08:26 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-20 19:08:26 -0700 |
| commit | 210f96c5ea5d19b75caadec5eee090c662a41a6c (patch) | |
| tree | 96762297c114278a2a641a181e72dbd9c4262e42 /vm/compiler/codegen/arm/CodegenFactory.c | |
| parent | 4ab981b9e07e2daf3e0122332a330b68fb783c85 (diff) | |
| parent | 95a48a0bdcdcd63d4323fa7a970ec5aafbc81bda (diff) | |
am 95a48a0b: manual merge
Merge commit '95a48a0bdcdcd63d4323fa7a970ec5aafbc81bda' into dalvik-dev
* commit '95a48a0bdcdcd63d4323fa7a970ec5aafbc81bda':
Fix dx launching script to use the new platform-tools location.
Diffstat (limited to 'vm/compiler/codegen/arm/CodegenFactory.c')
0 files changed, 0 insertions, 0 deletions