Android CTS 5.1 Release 25 (4400433)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWfkUbAAKCRDorT+BmrEO
eA8BAKCQ9VSs2BEGpneG/Akzasjzew7yAQCdFjzGBtuUUWznP1mCNpfOGNjWjAc=
=Gmtz
-----END PGP SIGNATURE-----
am 6ccd708a: am 0e406003: Merge "Fix crash/OOM in DiskBasedCache"

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