commit aedb1c843e9a1d3149ca81d586fa168d146d8f5e
author Narayan Kamath <narayan@google.com> Fri Nov 14 19:19:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 14 19:19:40 2014 +0000
tree d234c71076cbe0ddfb430cd8372ccdd631d89cf8
parent cc7432254e2569c2c8ddeeef2083cf2b43871730
parent 5d07648b367319b2da322acc58e3e6157bf912f2

am 5d07648b: am 26653bad: Fix build.

* commit '5d07648b367319b2da322acc58e3e6157bf912f2':
  Fix build.

include/media/openmax/OMX_AsString.h

diff --git a/include/media/openmax/OMX_AsString.h b/include/media/openmax/OMX_AsString.h
index 0f177a1..18e1e52 100644
--- a/include/media/openmax/OMX_AsString.h
+++ b/include/media/openmax/OMX_AsString.h
@@ -520,7 +520,7 @@
         case OMX_IndexParamVideoAndroidVp8Encoder:      return "ParamVideoAndroidVp8Encoder";
         case OMX_IndexParamVideoHevc:                   return "ParamVideoHevc";
 //      case OMX_IndexParamSliceSegments:               return "ParamSliceSegments";
-        case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";
+//      case OMX_IndexConfigAutoFramerateConversion:    return "ConfigAutoFramerateConversion";
         default:                                        return asString((OMX_INDEXTYPE)i, def);
     }
 }