Android CTS 5.1 Release 24 (4340933)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWdwI+QAKCRDorT+BmrEO
eC+QAKCMjfKVE23mh/6T2jLM+39Io7b1DgCff1+nx36iJzYf3+VtQK3gDKe32eM=
=fXY+
-----END PGP SIGNATURE-----
am 6ccd708a: am 0e406003: Merge "Fix crash/OOM in DiskBasedCache"

* commit '6ccd708adf345337137a7ef8efa6fd618afa7bc4':
  Fix crash/OOM in DiskBasedCache