| commit | 6f89ab02620d018ede782861ed9fc1610276e400 | [log] [tgz] |
|---|---|---|
| author | Benoit Lamarche <benoitlamarche@google.com> | Wed Apr 08 16:50:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 08 16:50:50 2015 +0000 |
| tree | de4dde2095021b2d05d40b53efdf6cc4a3ff630a | |
| parent | d6fc93cd3552bb81a9e41767a7f64b83439509cd [diff] | |
| parent | 00d77c918847afb570a38adefc03e6272b63b0ab [diff] |
am 00d77c91: resolved conflicts for merge of 6be6ed44 to lmp-mr1-dev-plus-aosp * commit '00d77c918847afb570a38adefc03e6272b63b0ab': Support --num-threads with --multi-dex (take 2)