-
MrApocalypse authored
Android 5.1.0 release 1 Conflicts: CleanSpec.mk core/Makefile core/apicheck_msg_current.txt core/build_id.mk core/tasks/apicheck.mk core/version_defaults.mk tools/releasetools/ota_from_target_files
02e58dbc
Android 5.1.0 release 1 Conflicts: CleanSpec.mk core/Makefile core/apicheck_msg_current.txt core/build_id.mk core/tasks/apicheck.mk core/version_defaults.mk tools/releasetools/ota_from_target_files