commit d7090cb6fbb9daab94e5e4de7faed507129f44db
author Dan Austin <danielaustin@google.com> Mon Mar 28 22:43:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Mar 28 22:43:26 2016 +0000
tree 5d7a045c96da4f41ec3eec7aee50258aff294b20
parent f7678e04c2fad05b2730e97468d96a660d84be20
parent 21f70a05c72fe6e131fdd6c82d0d92dad9f9f5cf

Merge "Address const issues in preparation for libcxx rebase."
am: 7f84a07

* commit '7f84a0700ca49cfdf650d46b383d6e5aaae05fdc':
  Address const issues in preparation for libcxx rebase.

init/devices.cpp

diff --git a/init/devices.cpp b/init/devices.cpp
index 557a6ac..e74140b 100644
--- a/init/devices.cpp
+++ b/init/devices.cpp
@@ -413,7 +413,7 @@
 static char **get_character_device_symlinks(struct uevent *uevent)
 {
     const char *parent;
-    char *slash;
+    const char *slash;
     char **links;
     int link_num = 0;
     int width;
@@ -467,7 +467,7 @@
 {
     const char *device;
     struct platform_node *pdev;
-    char *slash;
+    const char *slash;
     const char *type;
     char buf[256];
     char link_path[256];