tree e18196e10b6539a00359359335015a085ddb1260
parent b8a003c7b1a7a733049e6013d73b821786e198d7
parent 72353f83ff4057a64ff1e5ae3bc4b90de93e6171
author Yohann Roussel <yroussel@google.com> 1440168634 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440168634 +0000

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

* commit '72353f83ff4057a64ff1e5ae3bc4b90de93e6171':
  Ensure deterministic multidex partitioning