OSDN Git Service

am d9ba757e: Merge "Sync up nameser with upstream(2014.03.05)"
authorCalin Juravle <calin@google.com>
Fri, 7 Mar 2014 11:52:24 +0000 (11:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 Mar 2014 11:52:24 +0000 (11:52 +0000)
* commit 'd9ba757ef4546ef931cfa2fff4e206b36c955ead':
  Sync up nameser with upstream(2014.03.05)


Trivial merge