Merge "Increase timeout for domains with many DNS entries." into jb-mr2-dev
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Mar 2013 00:07:11 +0000 (00:07 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 21 Mar 2013 00:07:11 +0000 (00:07 +0000)
commit11787c02ad60f681af2cf4ef5d0fbf89efdbc4c2
tree10cf217a7fc8c969ae679921cff430ae8b4486fa
parentb723f1ae16c62d8e1e50c7bcd63d9b1552dd03cd
parenta9917b41429e3e18074d8a8a709894e488883686
Merge "Increase timeout for domains with many DNS entries." into jb-mr2-dev