tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
parent c44a86060045cd8b6108508095e9cf6984fe043c
parent 0733a23b98645cdc3ecb6199092282b21e06b2ab
author Dan Bornstein <danfuzz@android.com> 1294855111 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294855111 -0800

am fe564e7e: Merge "Add a dex-containing jar file to the luni test resources." into honeycomb

* commit 'fe564e7e61c70d784c800a8bb523a31e45a0366f':
  Add a dex-containing jar file to the luni test resources.