diff options
| author | Aaron Huang <huangaaron@google.com> | 2019-05-15 08:46:44 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 08:46:44 -0700 |
| commit | c2af11cf1bacec906ab316c57719b9ed94eeeaee (patch) | |
| tree | 595e7eb46d30b7598cf32a7fc7ee4fc3f3ef8e91 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 285a12043d509134313a96d9b483f4eb726f2a4f (diff) | |
| parent | 7afeb17fb24e567db805526dc1f549de01eb2e8f (diff) | |
[automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev
am: 7afeb17fb2 -s ours
am skip reason: change_id Ib3416ec37f0de12daf882068e00673ad60438c1a with SHA1 2493db8396 is in history
Change-Id: I4581c0ad5c5945c22835c6298c817e9ccf87975e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions