diff options
author | Erik Kline <ek@google.com> | 2018-05-24 11:32:32 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-24 11:32:32 -0700 |
commit | dcee8e5996f4c7f90a511a9eadfd0e90b1d60417 (patch) | |
tree | ee71f58699164d6cdc8cb2add3d2374d4c5df89b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | e3cce5bf980fcbb4429c5a9c61b8dcf3249ab53d (diff) | |
parent | 95cb9a1cb358423618fd79823207b02dccd91198 (diff) |
[automerger skipped] Merge "Fixup SntpClient to bypass Private DNS" am: a7183b92c4
am: 95cb9a1cb3 -s ours
Change-Id: I544b4901f51e6c3038045ef8f7e838161e06ec39
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions