resolved conflicts for merge of 7eea20df to master

Change-Id: Ibd8b16745d36b24041856f315fbb09a6c25cf4fb
2014-04-02 18:59:05 -07:00
parent 46be6edcc3 7eea20df86
commit 31aa8eea04
19 changed files with 288 additions and 194 deletions
--- a/libwvdrmengine/mediadrm/include/WVDrmPlugin.h
+++ b/libwvdrmengine/mediadrm/include/WVDrmPlugin.h
@@ -53,7 +53,7 @@ class WVDrmPlugin : public android::DrmPlugin,
  virtual status_t getKeyRequest(
      const Vector<uint8_t>& scope,
      const Vector<uint8_t>& initData,
-      const String8& mimeType,
+      const String8& initDataType,
      KeyType keyType,
      const KeyedVector<String8, String8>& optionalParameters,
      Vector<uint8_t>& request,