merge in jb-mr2-release history after reset to jb-mr2-dev
diff --git a/hal/audio_hw.h b/hal/audio_hw.h
index abe56dd..7bc2ecb 100644
--- a/hal/audio_hw.h
+++ b/hal/audio_hw.h
@@ -129,10 +129,10 @@
  * We should take care of returning proper size when AudioFlinger queries for
  * the buffer size of an input/output stream
  */
-#define DEEP_BUFFER_OUTPUT_PERIOD_SIZE 1024
+#define DEEP_BUFFER_OUTPUT_PERIOD_SIZE 960
 #define DEEP_BUFFER_OUTPUT_PERIOD_COUNT 8
 
-#define LOW_LATENCY_OUTPUT_PERIOD_SIZE 256
+#define LOW_LATENCY_OUTPUT_PERIOD_SIZE 240
 #define LOW_LATENCY_OUTPUT_PERIOD_COUNT 2
 
 #define HDMI_MULTI_PERIOD_SIZE  336