tree 86c99b5aa1c3e1f03e7f45b8d2bd29e5af05bcd5
parent 36c8c1039fca1c338796c4a8951c31e4fdf1d3b9
parent 06e1831f194389b6f56ac016ebb52ed5cd430bb2
author Selim Gurun <sgurun@google.com> 1331168715 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1331168715 -0800

Merge "Prevent potential stall on dns proxy operations."