tree 4682271507f91e56e557eb72fcf271a0b236395d
parent 0cdfa68cd07150b1f9f329ef0a76761b64ea1fdc
parent 72b8c5ae6a5f97a4fcfc6d23d33159d6ae50179c
author Andreas Huber <andih@google.com> 1264016102 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1264016102 -0800

Merge "Support for 'iTunes-style' metadata in .mp4 and .3gp files."