Merge "aboot: recovery: Boot into recovery mode if boot-recovery is filled"
diff --git a/app/aboot/recovery.c b/app/aboot/recovery.c
index fc14a7f..566d245 100644
--- a/app/aboot/recovery.c
+++ b/app/aboot/recovery.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved.
 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -434,6 +434,10 @@
 	}
 	msg.command[sizeof(msg.command)-1] = '\0'; //Ensure termination
 
+	if (!strncmp(msg.command, "boot-recovery", strlen("boot-recovery"))) {
+		boot_into_recovery = 1;
+	}
+
 	if (!strcmp("update-radio",msg.command))
 	{
 		/* We're now here due to radio update, so check for update status */