tree 242f1dcbdff71a41542fce75526412924674d5d3
parent 60195db609e4f5125e39348651d7a06ff807cc96
parent 00c464ff62c27dc12ef70f3b2d97e8b356ad21e0
author Raphael <raphael@google.com> 1252712065 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1252712065 -0700

am 00c464ff: Merge change 24751 into eclair

Merge commit '00c464ff62c27dc12ef70f3b2d97e8b356ad21e0' into eclair-plus-aosp

* commit '00c464ff62c27dc12ef70f3b2d97e8b356ad21e0':
  Windows SDK: add support for -J option to dx.bat