OSDN Git Service

resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp
authorEric Laurent <elaurent@google.com>
Sat, 17 Mar 2012 00:19:25 +0000 (17:19 -0700)
committerEric Laurent <elaurent@google.com>
Sat, 17 Mar 2012 00:19:25 +0000 (17:19 -0700)
commit9c450b31c18d0995ded7aae7552a0db36654c62e
tree8ec033794cd34cfcf513f4bf6b50754c73bf881f
parent0fce406301b24dafb98dff8f9cab3873e5398728
parentde61a78a1c7903efac9d26a2de0fd8db14cd7760
resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp

Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
media/libmedia/AudioTrack.cpp