am 437f9ab9: Add note about bug in IMuteSolo channel count.

Merge commit '437f9ab9914ea61112aa496a047162a0d22194cd'

* commit '437f9ab9914ea61112aa496a047162a0d22194cd':
  Add note about bug in IMuteSolo channel count.
am 210602c4: Fix printf format bug.

Merge commit '210602c46068065dcd15ad78e4af26593d61f03f'

* commit '210602c46068065dcd15ad78e4af26593d61f03f':
  Fix printf format bug.
am ca4bf6e7: Merge "Make test apps work on host platform." into gingerbread

Merge commit 'ca4bf6e7366991ed2d124b7240a0657e30b8ad39'

* commit 'ca4bf6e7366991ed2d124b7240a0657e30b8ad39':
  Make test apps work on host platform.
am aee4409e: Improve platform portability.

Merge commit 'aee4409e59584f8e8d0ddaf7e44dc80ec5b80444'

* commit 'aee4409e59584f8e8d0ddaf7e44dc80ec5b80444':
  Improve platform portability.
Fix compilation problem - wrong include path

Change-Id: I55b39c1b3e0171328bdce8e4295439d3610c1226
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge commit 'b6bc27bacf2c3f18f952a43511534ec1653cafb8' into HEAD

* commit 'b6bc27bacf2c3f18f952a43511534ec1653cafb8':
  Fix compilation problem - wrong include path

Conflicts:
	libopensles/IThreadSync.c
	tests/mimeUri/playUri/Android.mk
	tests/mimeUri/playUri2/Android.mk
First use in oxygen