tree f2271538d0e02ebe937516274ce713b63e28f4ed
parent 20949a76fee62e89d7dc22858a74469efa14f61d
parent 0dd19a8394dea139804fea126ce9ba7539a3724d
author Robert Greenwalt <rgreenwalt@google.com> 1360627059 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1360627067 +0000

Merge "Reintroduce the net.dns system properties <TEMP>"