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

iEYEABECAAYFAlYxAW0ACgkQ6K0/gZqxDnhR1ACfWKjv3J0O0Dl8f08gJidHph+b
lroAn39vkESU1qp7k0WiLdjDTeN63Uis
=Ws/m
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning