OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 695e85d ab6f2d6)
am 0ef0d76a: (-s ours) am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues
authorAndreas Huber <andih@google.com>
Thu, 13 Jan 2011 03:01:17 +0000 (19:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 03:01:17 +0000 (19:01 -0800)
* commit '0ef0d76a9d5477942d5586933d35d299671fadc5':
  DO NOT MERGE: Fix Matroska issues


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