tree 136beef06681030a44b8e520599f644ce7834e4f
parent 59cce987ec7e0971083253c1b21b23e65cc26dec
parent c4dc4f3fc29918b70ee963ef779079a7685c610b
author Erik Kline <ek@google.com> 1467967691 +0000
committer android-build-merger <android-build-merger@google.com> 1467967691 +0000

Merge \"Add UIDs for system DNS and tethering DNS\"
am: c4dc4f3fc2

Change-Id: I40d246a3d4c293797ae5204cebd61b50c4021205