Android CTS 6.0 Release 17 (3866870)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAljdoz0ACgkQ6K0/gZqxDni0IwCgie37km7PC8TXntpwSAI5g8VA
IdUAn2LmDPiyzJ1YV6GLoytGmKkUFTVK
=n+i3
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning