OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ef7e3b9 e5f6fe5)
am e5f6fe59: am 59ac0b14: Merge "Handle unknown duration in playMediaSamples test...
authorMarco Nelissen <marcone@google.com>
Wed, 27 May 2015 23:31:29 +0000 (23:31 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 May 2015 23:31:29 +0000 (23:31 +0000)
* commit 'e5f6fe59e769e6a8c3f2b0c6819fdef61ee29747':
  Handle unknown duration in playMediaSamples test


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