diff options
| author | Aaron Huang <huangaaron@google.com> | 2019-05-15 09:12:13 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 09:12:13 -0700 |
| commit | 1c238000c714ab9393159bd34b1befc3a2a0d9ee (patch) | |
| tree | fcc962cfe53a45b07a5ecb4d9c002072c5669d85 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e1fb6197bbd8bfe06d2bc8def7ebaccbe353bb9f (diff) | |
| parent | c2af11cf1bacec906ab316c57719b9ed94eeeaee (diff) | |
[automerger skipped] Merge "Dropping NAT-T keepalive packet from APF" into qt-dev am: 7afeb17fb2 -s ours
am: c2af11cf1b -s ours
am skip reason: change_id If62ba7fdb5f0f0f0a7a59ec169e82b4e3147eedd with SHA1 95538d2d6b is in history
Change-Id: I68ce3aa589cc926a1c92ea9c932bf3f54974b001
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions