OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dbb74f4 da33d66)
am da33d66e: Merge "Add .mpga to acceptable file name extensions list."
authorMarco Nelissen <marcone@google.com>
Fri, 16 Nov 2012 17:34:19 +0000 (09:34 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 16 Nov 2012 17:34:19 +0000 (09:34 -0800)
* commit 'da33d66e68791d0bfeccebc8253a59467b5ef670':
  Add .mpga to acceptable file name extensions list.


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