resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp

Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122

diff --cc media/libmedia/AudioTrack.cpp
index d51cd69,498ad45..3a8bfa3
--- 1/media/libmedia/AudioTrack.cpp
--- 2/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@@ -763,12 -763,9 +763,9 @@@ status_t AudioTrack::createTrack_l
                  mNotificationFramesAct = frameCount/2;
              }
              if (frameCount < minFrameCount) {
-                 if (enforceFrameCount) {
-                     ALOGE("Invalid buffer size: minFrameCount %d, frameCount %d", minFrameCount, frameCount);
-                     return BAD_VALUE;
-                 } else {
-                     frameCount = minFrameCount;
-                 }
 -                LOGW_IF(enforceFrameCount, "Minimum buffer size corrected from %d to %d",
++                ALOGW_IF(enforceFrameCount, "Minimum buffer size corrected from %d to %d",
+                          frameCount, minFrameCount);
+                 frameCount = minFrameCount;
              }
          } else {
              // Ensure that buffer alignment matches channelcount