commit 3cc69faa6797ae0cfe43f4243d564fbe14f4cfe4
author Dan Austin <danielaustin@google.com> Tue Apr 12 22:33:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 12 22:33:13 2016 +0000
tree bb70205f02b3bafb35b682ae2ade25d0e37e8de2
parent e7af39dc4b616f6a37c6ab691c48ad745f2a428b
parent a4f7dadd389e25d2b5749d1edf65081b3a4e6961

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

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

Change-Id: I63c3a205db98d956c3c02a4f4f6fd87fd4e052e8

Utils.cpp

diff --git a/Utils.cpp b/Utils.cpp
index e4f473a..a9bddfa 100644
--- a/Utils.cpp
+++ b/Utils.cpp
@@ -211,7 +211,7 @@
     for (auto line : output) {
         // Extract values from blkid output, if defined
         const char* cline = line.c_str();
-        char* start = strstr(cline, "TYPE=");
+        const char* start = strstr(cline, "TYPE=");
         if (start != nullptr && sscanf(start + 5, "\"%127[^\"]\"", value) == 1) {
             fsType = value;
         }