OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 370a0ea 7419051)
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge...
authorAndreas Huber <andih@google.com>
Wed, 7 Dec 2011 00:59:52 +0000 (16:59 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 7 Dec 2011 00:59:52 +0000 (16:59 -0800)
* commit '92860d5d4681e684d5f3936137c6c067c950121e':
  DO NOT MERGE: Remove the AVI extractor.


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