am 11787c02: Merge "Increase timeout for domains with many DNS entries." into jb...
authorJeff Sharkey <jsharkey@android.com>
Thu, 21 Mar 2013 00:11:12 +0000 (00:11 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 21 Mar 2013 00:11:12 +0000 (00:11 +0000)
commitbe966bee7d97273bd0ac8b37ae29c957fa4fe072
tree8b7eaca938e6d5cdf222f5c97fb88ce5c3c70db8
parent833bc4cf4f542922453331745851a172dfe2cf45
parent11787c02ad60f681af2cf4ef5d0fbf89efdbc4c2
am 11787c02: Merge "Increase timeout for domains with many DNS entries." into jb-mr2-dev

* commit '11787c02ad60f681af2cf4ef5d0fbf89efdbc4c2':
  Increase timeout for domains with many DNS entries.