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

iEYEABECAAYFAlYxAeIACgkQ6K0/gZqxDnhZrQCeOvT8rF4KamEsBmF56tlfhC2O
JcUAn0uREKvXTG3khFMD2I2JDTRM6caL
=FHRO
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning