OSDN Git Service

resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp
authorEric Laurent <elaurent@google.com>
Sat, 17 Mar 2012 00:22:34 +0000 (17:22 -0700)
committerEric Laurent <elaurent@google.com>
Sat, 17 Mar 2012 00:22:34 +0000 (17:22 -0700)
commite341547e2931b4aae4681053491ba5ccbab06e6f
tree8ec033794cd34cfcf513f4bf6b50754c73bf881f
parent51011e8de5a37b3912ab0c40e407b60e64a908ee
parent9a55cd24e8b1175b604ba098e6b3a090591c93a3
resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp

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