OSDN Git Service

resolved conflicts for merge of 2917f475 to master
authorJean-Michel Trivi <jmtrivi@google.com>
Wed, 30 Nov 2011 18:13:36 +0000 (10:13 -0800)
committerJean-Michel Trivi <jmtrivi@google.com>
Wed, 30 Nov 2011 18:13:36 +0000 (10:13 -0800)
commita25ef482e57eafa920e6a496eaebe25e025bdbb5
tree1b5d9c79a448efe06cb7d52f6b082c40d9b1b397
parent173f421ad6dc546281a2a343586f9a9aed1ef5be
parent2917f475d6f2058ed177ee2a51fdf7069645ba3e
resolved conflicts for merge of 2917f475 to master

Change-Id: I63f4689fabb2aee1682d785ad9c41f06de380396
wilhelm/src/android/android_StreamPlayer.cpp
wilhelm/src/android/android_defs.h
wilhelm/src/itf/IAndroidBufferQueue.c