OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cd6aee 42d211f)
am 02a1f789: Merge "Limit the total amount of ID3 metadata to something (un-)reasonab...
authorAndreas Huber <andih@google.com>
Mon, 29 Mar 2010 22:39:53 +0000 (15:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 29 Mar 2010 22:39:53 +0000 (15:39 -0700)
Merge commit '02a1f78987a1e6bfa361806fcd3b0a02783b09b9' into froyo-plus-aosp

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


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help