tree b27a6c6d1bce50b727ec63602765f8bc7c7b3266
parent 3e0339f9ec42c2c31deb632254e9cc8a06d3db91
parent 1629399bb578fc176613ccaf134d1be6e3047638
author Andreas Huber <andih@google.com> 1277324056 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1277324056 -0700

Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into gingerbread