History log of /dalvik/dx/tests/119-merge-conflict/com/android/dx/merge/MergeConflictTest.java
Revision Date Author Comments
09d308b04b7c4fd3ed83a8f8f4c07be67a25478c 17-Mar-2011 Jesse Wilson <jessewilson@google.com> Add support for pre-dexed libraries to dx.

http://b/4090053

Change-Id: Ifb8b9230939cb2a72a767128f79cbfbd042e95a6