commit 632350257cd93e34aa1e8b354c1535864b314c38
author Dan Austin <danielaustin@google.com> Mon Mar 28 15:09:02 2016 -0700
committer Dan Austin <danielaustin@google.com> Mon Mar 28 15:09:02 2016 -0700
tree b06b11c778bed6a8cbcfb119086a9be82aef084a
parent 880e74ef01fea3def5a5c9b53784bba55e6f7ec0
parent 1ccaed4d2ba9af76bb30b286880dba687e36dbdc

resolve merge conflicts of 1ccaed4 to nyc-dev-plus-aosp

Change-Id: Ib30c59ff496ed76ec46f4c8f7d954d571bcbf4ae

cmds/installd/installd.cpp

diff --git a/cmds/installd/installd.cpp b/cmds/installd/installd.cpp
index de3f54a..a06214b 100644
--- a/cmds/installd/installd.cpp
+++ b/cmds/installd/installd.cpp
@@ -65,8 +65,8 @@
                              const char *oat_dir,
                              const char *apk_path,
                              const char *instruction_set) {
-    char *file_name_start;
-    char *file_name_end;
+    const char *file_name_start;
+    const char *file_name_end;
 
     file_name_start = strrchr(apk_path, '/');
     if (file_name_start == NULL) {