diff options
| author | Andreas Huber <andih@google.com> | 2011-03-22 11:42:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-22 11:42:51 -0700 |
| commit | 245af5e9ecb1881aa0b05f73bdbd249ec49a2af1 (patch) | |
| tree | 1b3a3fc4534c5e6a8dd394b6f791aeab8ae6cf52 /include/drm | |
| parent | 69bb5a1af521434dfec4c64057a430ffa57b9a11 (diff) | |
| parent | 0e680d80363358f1759a376d9a968732ac41bbe8 (diff) | |
| download | frameworks_av-245af5e9ecb1881aa0b05f73bdbd249ec49a2af1.zip frameworks_av-245af5e9ecb1881aa0b05f73bdbd249ec49a2af1.tar.gz frameworks_av-245af5e9ecb1881aa0b05f73bdbd249ec49a2af1.tar.bz2 | |
am 71ba7d34: (-s ours) am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1
* commit '71ba7d34bc1c900a872d5353e3f04c3751fa95f8':
DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
Diffstat (limited to 'include/drm')
0 files changed, 0 insertions, 0 deletions