OSDN Git Service

resolved conflicts for merge of f285c91e to master
authorElliott Hughes <enh@google.com>
Thu, 22 May 2014 17:14:43 +0000 (10:14 -0700)
committerElliott Hughes <enh@google.com>
Thu, 22 May 2014 17:14:43 +0000 (10:14 -0700)
commit87cebadd48710e42474756fc3513df678de045ce
tree6f8a07d9ec9b4ebad70367430190a689cb1a5db3
parent77a3374a6170fb5f0168169bc4bc3fa9baf318eb
parentf285c91efbae23783fe94dc5ad19a2560e157685
resolved conflicts for merge of f285c91e to master

Change-Id: I4c995e297d09c0854a42142cc57dce8b771acf65
camera/VendorTagDescriptor.cpp
media/libnbaio/NBLog.cpp
services/audioflinger/AudioFlinger.cpp
services/audioflinger/FastMixer.cpp
services/audioflinger/Threads.cpp
services/medialog/MediaLogService.cpp