Android CTS 6.0 Release 25 (4485418)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWlVvpgAKCRDorT+BmrEO
eOaLAJ9aNbs5h5Wg2KCAZ90EdPmJHbJ09ACdFDOT0Kdh/HIUlEfXT55KDMJDS2Q=
=Csql
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning