Home | History | Annotate | Download | only in 119-merge-conflict
      1 Merges dex files with and without conflicts.
      2 
      3 The run script requires vogar, so you must have vogar on your $PATH to run this
      4 test. You'll also need a device or host VM for vogar to attach to.
      5 
      6