OSDN Git Service

am 538c310b: am 02a1f789: Merge "Limit the total amount of ID3 metadata to something...
authorAndreas Huber <andih@google.com>
Mon, 29 Mar 2010 22:43:19 +0000 (15:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Mar 2010 22:43:19 +0000 (15:43 -0700)
commit6c6065e14035cf9c88e98996cf0ed18abe32d1a9
tree047e2c017054b95ac704da599699aea964de3aa8
parentfa60d398a5ee3ca6fdb903e0ff4027562d4f26d7
parent27521d041a3c26c9e8b5ed30da4be3b4cb7aaf92
am 538c310b: am 02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB." into froyo

Merge commit '538c310b091a6cc74020423deed9d62703f3f13f' into kraken

* commit '538c310b091a6cc74020423deed9d62703f3f13f':
  Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.