Android CTS 6.0 release 6
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlcnpC0ACgkQ6K0/gZqxDnhIdwCbBOdcuKKGSTplVMeZIaPo7Amp
EqYAnAuoaNxnWaW3lI52RBv6q7txOtka
=sskC
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning