tree 664d70327bd2e2c7c4af566bfc8989333b3aa586
parent d17378f90186b0071ce2279e0d03f16f0a76cb58
parent 68eff53e7ed9df06f194478930f39b31c7a32458
author Lorenzo Colitti <lorenzo@google.com> 1409723353 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409723353 +0000

am 68eff53e: Allow configuring a socket mark for DNS packets.

* commit '68eff53e7ed9df06f194478930f39b31c7a32458':
  Allow configuring a socket mark for DNS packets.