OSDN Git Service

am f535485c: am 0bca08d6: Merge "Update res_debug.c to take into account changes...
authorCalin Juravle <calin@google.com>
Mon, 10 Mar 2014 11:32:02 +0000 (11:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 10 Mar 2014 11:32:02 +0000 (11:32 +0000)
commit66016dad14425d1c058b764b4cf5c498eb609a8c
tree698b0f8038d21d2329a3d180c412cf0d6b85cf00
parentc13a1b2bad71bc0d3094835f4007fc2055702a75
parentf535485cc0fef33faaaa2bc2e2a0bd9d7254e97e
am f535485c: am 0bca08d6: Merge "Update res_debug.c to take into account changes to the nameser.h"

* commit 'f535485cc0fef33faaaa2bc2e2a0bd9d7254e97e':
  Update res_debug.c to take into account changes to the nameser.h