diff options
author | Marco Nelissen <marcone@google.com> | 2012-11-20 09:27:21 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-20 09:27:21 -0800 |
commit | 34a895226e062c15197e2be1dd710098224702c3 (patch) | |
tree | f1d7c52b77772845505c7acc5806b58e3c77d9b7 /media/libmedia/Metadata.cpp | |
parent | bc9ea63daaad764d242ce0eadfeb697abb9ce34e (diff) | |
parent | fcc6d852b6efb93c1f189399446e4219578cc311 (diff) | |
download | frameworks_av-34a895226e062c15197e2be1dd710098224702c3.zip frameworks_av-34a895226e062c15197e2be1dd710098224702c3.tar.gz frameworks_av-34a895226e062c15197e2be1dd710098224702c3.tar.bz2 |
am 343f9c81: am dca2b5d7: Merge "Changed parsing of trkn and disk from 8 bits to 16 bits"
* commit '343f9c81f293f56e09b1cc1921844ecd3372e435':
Changed parsing of trkn and disk from 8 bits to 16 bits
Diffstat (limited to 'media/libmedia/Metadata.cpp')
0 files changed, 0 insertions, 0 deletions