tree 330785a37986c0efc39334397ca2c2c7c1a09f6d
parent 5b025c46158f2b4eb95bc062170b7d585d967d0c
parent 118a150a67f45130755d82491b4d98940c15dbd0
author Andreas Huber <andih@google.com> 1297983158 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1297983158 -0800

Merge "Experimental support for https transfers in stagefright."