OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b94266 f64bd47)
am f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do...
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 1 Jul 2013 14:47:50 +0000 (07:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 1 Jul 2013 14:47:50 +0000 (07:47 -0700)
* commit 'f64bd473e4c500dc54923baac7261e6d2d72daa6':
  Update HTTP proxy configuration for all media playback inside stagefright.


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