diff options
| author | Erik Kline <ek@google.com> | 2016-06-30 05:49:28 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-30 05:49:28 +0000 |
| commit | d2f3c69222be2dd4b5a6b855b3db35ac2be5d320 (patch) | |
| tree | 28b9173c974e0b35be79b273c74d257e259b649d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 60b85827ab0be0bb85abe143bbac984473bd90bb (diff) | |
| parent | ce7ff88bc2c5334d9985308136dd672b9cdb90d0 (diff) | |
Merge \"Make provisioning timeout apply to both IPv4 and IPv6\" into nyc-mr1-dev
am: ce7ff88bc2
Change-Id: I4f2f7cf0d51cee4a657a750cfcd58e5638b3fce5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions