am d34c722c: Merge changes Iac33dbaa,I18fcd37d into mnc-dev

* commit 'd34c722c59b13c80f89cfdeaf45ff38a3a12a6c5':
  pass in correct buffer to print_id
  stop including rootdir build.prop
This commit is contained in:
Andres Morales 2015-05-08 16:40:44 +00:00 committed by Android Git Automerger
commit d7f055bc76
2 changed files with 1 additions and 2 deletions

View file

@ -509,7 +509,6 @@ void load_persist_props(void) {
void load_all_props() {
load_properties_from_file(PROP_PATH_SYSTEM_BUILD, NULL);
load_properties_from_file(PROP_PATH_VENDOR_BUILD, NULL);
load_properties_from_file(PROP_PATH_BOOTIMAGE_BUILD, NULL);
load_properties_from_file(PROP_PATH_FACTORY, "ro.*");
load_override_properties();

View file

@ -278,7 +278,7 @@ int main(int argc, char **argv)
}
if (get_id) {
print_id(sha, sizeof(hdr.id));
print_id((uint8_t *) hdr.id, sizeof(hdr.id));
}
return 0;