commit | 00f21404b9b2284fa1827cd575eed9c7a4db1402 | [log] [tgz] |
---|---|---|
author | Erik Kline <ek@google.com> | Fri Jul 08 08:59:07 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jul 08 08:59:07 2016 +0000 |
tree | 09d21fe78c41dac507644fb2beb111824b613956 | |
parent | 529be36f5322191ffba555adc449e771a5433977 [diff] | |
parent | ffd5470876cff2a764c111270961695766c73c09 [diff] |
Merge \\\\"Add UIDs for system DNS and tethering DNS\\\\" am: c4dc4f3fc2 am: fcf3ed51dc am: 9f31416013 am: 5f7ecd953a Change-Id: I9c3c4da8626f675d9831a6eb790463e6e382382e