diff options
author | Erik Kline <ek@google.com> | 2017-09-08 04:41:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-09-08 04:41:57 +0000 |
commit | 5c1ebdd5c3fe1fcdcf54fbd2e0fa8911ef2394f1 (patch) | |
tree | 8c0eab0165daeda18e1cfc782e516f359f3117a6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 500f63b54a21f52c74b2fdca2f9cdbe523f13473 (diff) | |
parent | 5c8c836bc480a7b153e7d8b56c299cb9ebdca212 (diff) |
Merge "Support NAT keepalives" am: 6c7c55206d
am: 5c8c836bc4
Change-Id: I3b6b8cbc54d7139c5e2274c63a9dcfb97f166161
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions