Android O MR1 IOT Release 1.0.4 (4973263)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW5AoswAKCRDorT+BmrEO
ePsDAJ0b4eBv9OPuCQucdETCRD4q/wz0vACeNXoG7u+AoeVBFb+1miVaCmHx21M=
=iWI8
-----END PGP SIGNATURE-----
Merge "Inline contents of core_base.mk in mini_common.mk"
am: ee034bd356

Change-Id: Ia7ddb4a102609444fb839df5b53022cfb9bcb4a2