diff options
author | Andreas Huber <andih@google.com> | 2010-06-23 13:23:24 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-23 13:23:24 -0700 |
commit | 230f5c1cfb898430c12eee40b8321385bc495e9c (patch) | |
tree | 1de3e456cfa641459c75a5b263ec8a4ab7d86806 /media/libmedia | |
parent | 565879dc8655f37a0f55e59c98c5cad6314a9c4b (diff) | |
parent | 03e90f7eeb032c981fc2952aa33f6ba1fae20d97 (diff) | |
download | frameworks_base-230f5c1cfb898430c12eee40b8321385bc495e9c.zip frameworks_base-230f5c1cfb898430c12eee40b8321385bc495e9c.tar.gz frameworks_base-230f5c1cfb898430c12eee40b8321385bc495e9c.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')
-rw-r--r-- | media/libmedia/MediaScanner.cpp | 4 |
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> |