OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7aceca3 d361aa9)
am d361aa93: (-s ours) Do not merge Added added logging for audio/video in mediaplaye...
authorMita Yun <mitayun@google.com>
Fri, 17 Aug 2012 17:44:30 +0000 (10:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Aug 2012 17:44:30 +0000 (10:44 -0700)
* commit 'd361aa937b3072987d67e4087a42b713a88d44e8':
  Do not merge Added added logging for audio/video in mediaplayer.java


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