Android CTS 6.0 release 2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlZfPvwACgkQ6K0/gZqxDnjKQgCePmskN+tKA1fCMwA7eHCwVJ12
axoAnjtiOAZNNfvKXZkHifvMUXRDeZ1b
=glpX
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning