tree ec4a3aae408bf5d225a48fbc63e4020adb86fc62
parent 4f8a92bd20be374811b2cab855f390221893279a
parent 8ef3401d2ae613ff0f14d75be860f5c833019494
author Paul Jensen <pauljensen@google.com> 1401414351 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1401414352 +0000

Merge "Adjust Network's SocketFactory to restrict host name resolution to that Network" into lmp-preview-dev