History log of /dalvik/dx/tests/119-merge-conflict/run
Revision Date Author Comments
324d2f23a7174848f7d130c43c903325c99a93c7 18-Mar-2011 Jesse Wilson <jessewilson@google.com> Use 'dalvikvm' only to test dx.

Change-Id: I1fca7ce23e9b3706d75580c06956d49d79614fe6
http://b/4090053
09d308b04b7c4fd3ed83a8f8f4c07be67a25478c 17-Mar-2011 Jesse Wilson <jessewilson@google.com> Add support for pre-dexed libraries to dx.

http://b/4090053

Change-Id: Ifb8b9230939cb2a72a767128f79cbfbd042e95a6