Android CTS 6.0 Release 22 (4267323)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWa807QAKCRDorT+BmrEO
eLhJAJ40pcwQ9NNO8MUlooRiEUtxEbJOQwCePvX6APgBtPBeOzGb/jT6Bzn489Y=
=Q7OJ
-----END PGP SIGNATURE-----
am 1396cdeb: am 72353f83: resolved conflicts for merge of ab01c96b to lmp-mr1-dev

* commit '1396cdeb03bf25c33d461a734f6ce739c8c5bc32':
  Ensure deterministic multidex partitioning