Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c

am: 17f1fc6c76

Change-Id: If968940949e97633e99832a3edc1d3003662dac2

media/jni/soundpool/SoundPool.h

@@ -37,7 +37,7 @@ class SoundPool;
 // for queued events
 class SoundPoolEvent {
 public:
-    SoundPoolEvent(int msg, int arg1=0, int arg2=0) :
+    explicit SoundPoolEvent(int msg, int arg1=0, int arg2=0) :
         mMsg(msg), mArg1(arg1), mArg2(arg2) {}
     int         mMsg;
     int         mArg1;

media/jni/soundpool/SoundPoolThread.h

@@ -40,7 +40,7 @@ public:
  */
 class SoundPoolThread {
 public:
-    SoundPoolThread(SoundPool* SoundPool);
+    explicit SoundPoolThread(SoundPool* SoundPool);
     ~SoundPoolThread();
     void loadSample(int sampleID);
     void quit();