| commit | 2c1648df9d2d623c602fee17048abc82c9e44d55 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 01 07:47:50 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 01 07:47:50 2013 -0700 |
| tree | 31917998e2c06e08c4161aeb7467291fe3ccc305 | |
| parent | 3b942668596cb7c4d927ffe0d250c69bbaf67386 [diff] | |
| parent | f64bd473e4c500dc54923baac7261e6d2d72daa6 [diff] |
am f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge * commit 'f64bd473e4c500dc54923baac7261e6d2d72daa6': Update HTTP proxy configuration for all media playback inside stagefright.