Android 5.0.0 release 1
merge in lmp-release history after reset to 7460b6e0abad953fc8946296fa3f11bc4b1b60c6