Android CTS 6.0 Release 31 (4890202)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW3MZTAAKCRDorT+BmrEO
eJAeAJ4iccIDtKaPW5pBg4/TeJWCwTHDnQCgg2izKsHqrifZr7ENNopIaPPFHqk=
=81iF
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning