OSDN Git Service

resolved conflicts for merge of 426a9137 to master
authorPaul McLean <pmclean@google.com>
Tue, 15 Jul 2014 21:57:22 +0000 (14:57 -0700)
committerPaul McLean <pmclean@google.com>
Tue, 15 Jul 2014 21:57:22 +0000 (14:57 -0700)
commit15bbd005254d204e29bc2666ceceee6e81069115
treec1f66e2474cd928513a3924e487497dbd3307da8
parent9d5428c4c7a2b6c4feae246fe2c2c281a20b1696
parent0467a5fe3ee06561267a5d14e405799dbf9dbcc0
resolved conflicts for merge of 426a9137 to master

Change-Id: Iac4dc57a15b0306d1f54283752872b32fab74e59
modules/usbaudio/audio_hw.c