tree a8c36425833248efd74f1b85fc1e4c9208d3285f
parent 569fb9887d00104509df79fa77d92e3cf9afe7db
author Calin Juravle <calin@google.com> 1394032012 +0000
committer Calin Juravle <calin@google.com> 1394131003 +0000

Sync up nameser with upstream(2014.03.05)

Bug: 13219633

Change-Id: I8ee4ddf270710e9eea415fa3db984af7719a8dd4