tree 1087570ce72cf982aee460efb8a56eb8625b53ce
parent 6fe795a0dc629710ad27594ea837b234a9e8b289
parent 1396cdeb03bf25c33d461a734f6ce739c8c5bc32
author Yohann Roussel <yroussel@google.com> 1440168975 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440168975 +0000

am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning