OSDN Git Service

DO NOT MERGE Add new info functions to resolver for use by Netd. am: 21bf063727
authorPierre Imai <imaipi@google.com>
Thu, 21 Apr 2016 06:48:41 +0000 (06:48 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Apr 2016 06:48:41 +0000 (06:48 +0000)
commitb724457e2d303c8ec8ef234713e2ce1aa31e3be1
treef8450f4e977483fc3ec9e7f5c87159375fef0c28
parentba410130395c3e2809bc901ac0537c2bc60b2322
parentfe3c378a38fd2f0fc3bd7641a576676fb1864f7c
DO NOT MERGE Add new info functions to resolver for use by Netd. am: 21bf063727
am: fe3c378a38  -s ours

* commit 'fe3c378a38fd2f0fc3bd7641a576676fb1864f7c':
  DO NOT MERGE Add new info functions to resolver for use by Netd.

Change-Id: I521edae745c3768949a88fc813d381237e410f1b