tree f97e85512bec47cbfcf5b7e6532031f59fcc447e
parent b2e822fc2ac87703ac12d062add62408574cbf7c
parent 2ed77701f908f63e072abd0e7eb1c4af61f9347f
author Marco Nelissen <marcone@google.com> 1332260105 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1332260105 -0700

Merge "Parse mp3 encoder padding/delay"