tree c186b0aaaafe69db34654f5ba9f76af3481eeff9
parent 8c44e74524a43ad7cb41b1641bb2dac75cf9c7e8
parent f361e3dff9bb3d8ed72a76d5703761140296bbd0
author Paul Jensen <pauljensen@google.com> 1432118942 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1432118944 +0000

Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev