Merge change 9594

* changes:
  init: add permissions for /dev/diag and /dev/diag_arm9
diff --git a/init/devices.c b/init/devices.c
index 720b913..71c45c4 100644
--- a/init/devices.c
+++ b/init/devices.c
@@ -96,6 +96,8 @@
     { "/dev/log/",          0662,   AID_ROOT,       AID_LOG,        1 },
 
         /* these should not be world writable */
+    { "/dev/diag",          0660,   AID_ROOT,       AID_ROOT,        0 },
+    { "/dev/diag_arm9",     0660,   AID_ROOT,       AID_ROOT,        0 },
     { "/dev/android_adb",   0660,   AID_ADB,        AID_ADB,        0 },
     { "/dev/android_adb_enable",   0660,   AID_ADB,        AID_ADB,        0 },
     { "/dev/ttyMSM0",       0600,   AID_BLUETOOTH,  AID_BLUETOOTH,  0 },