tree fe6504722b179ef124f9a28ed7f8d136e70dfa5b
parent fd70aa8443b9d4fa791530f61ee3f40445d7ad90
parent 6a9b8b7fa2bfac98766a558fee7aa8938fac7678
author Benoit Lamarche <benoitlamarche@google.com> 1423622986 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423622986 +0000

am 6a9b8b7f: am 6e28e432: Merge "Support --num-threads with --multi-dex"

* commit '6a9b8b7fa2bfac98766a558fee7aa8938fac7678':
  Support --num-threads with --multi-dex