summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaScanner.cpp
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-06-23 13:23:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-23 13:23:24 -0700
commited914577e770697e23884886787e333588eb4c61 (patch)
tree7c342abf7d3e559394f3870ca5dd300a4b703659 /media/libmedia/MediaScanner.cpp
parentc08d805c8d7ba0da56988382f7e9b70b98468636 (diff)
parentd255a4e04d06796441ae234e8f3a8277578b3446 (diff)
downloadframeworks_av-ed914577e770697e23884886787e333588eb4c61.zip
frameworks_av-ed914577e770697e23884886787e333588eb4c61.tar.gz
frameworks_av-ed914577e770697e23884886787e333588eb4c61.tar.bz2
am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread
Merge commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97' * commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97': Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
Diffstat (limited to 'media/libmedia/MediaScanner.cpp')
-rw-r--r--media/libmedia/MediaScanner.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libmedia/MediaScanner.cpp b/media/libmedia/MediaScanner.cpp
index b2a6109..24426ff 100644
--- a/media/libmedia/MediaScanner.cpp
+++ b/media/libmedia/MediaScanner.cpp
@@ -14,6 +14,10 @@
* limitations under the License.
*/
+//#define LOG_NDEBUG 0
+#define LOG_TAG "MediaScanner"
+#include <utils/Log.h>
+
#include <media/mediascanner.h>
#include <sys/stat.h>