Android 6.0.0 release 24
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlYxAc4ACgkQ6K0/gZqxDnjR6ACffiSLdPLDiZgrLsc6+CZAzj8j
EsUAoIaQozu0+zZW2wp+HobOtFwdUXBB
=XWRa
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning