tree e196227f068c3f141659a6324fb482412011f254
parent 1bccfdaae43f2f10c5a440bccfa535d059e1654e
author Jesse Wilson <jessewilson@google.com> 1330736260 -0500
committer Jesse Wilson <jessewilson@google.com> 1330736260 -0500

Track mockito change to not use META-INF, since that directory is ignored by Android tools. Also remove vogar-specific hack for the on-device dex directory.