diff options
author | Erik Kline <ek@google.com> | 2017-09-08 04:27:34 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-08 04:27:34 +0000 |
commit | 5c8c836bc480a7b153e7d8b56c299cb9ebdca212 (patch) | |
tree | 6e4a318a1bd39fa7461762fb8cf82b7e799ee0ab /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 166413798d1782d18f0bbfbed96174d55338b4c3 (diff) | |
parent | 6c7c55206dcca24880ac873fdf34c6f099dc0759 (diff) |
Merge "Support NAT keepalives"
am: 6c7c55206d
Change-Id: Id241560fa48636f1bc56fa06d2151f1bcbdb19ab
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions