tree 4934397842dec6ad482d1e6bc93782840b5433eb
parent ffea8ef2f0c10c73298c291bea3ca8ad38f0bb12
parent 5cf9ec4c82bc3fb3f5787c2fcf06c28dbf449789
author Marco Nelissen <marcone@google.com> 1294433016 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1294433016 -0800

Merge "Add support for the "compilation" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831" into honeycomb