tree 6b7c9a23f6a7460a8721ffc1605711a92c3a6754
parent 911b9aae9aa2e2a199431f7638ac1027b6ff21ab
parent 14a75c1364463d08752750c36327114bf08a150f
author Dan Bornstein <danfuzz@android.com> 1294861751 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1294861751 -0800

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

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