diff options
| author | Aaron Huang <huangaaron@google.com> | 2019-05-15 17:45:56 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-15 17:45:56 -0700 |
| commit | 92ba6d1ebe22507b71aaad39eb98fda04fb35710 (patch) | |
| tree | 595e7eb46d30b7598cf32a7fc7ee4fc3f3ef8e91 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 18803338173da1c6f2ef97f6ef63e158ae0a7988 (diff) | |
| parent | 2913482e08d4f926d122d255dce17a6cede17147 (diff) | |
[automerger skipped] Merge "apf: Remove IPv6 NAT-T keepalive related codes and ApfTest improvement" into qt-dev
am: 2913482e08 -s ours
am skip reason: change_id If01bc6a71cf26e13edc049d969d23088fa8242e4 with SHA1 ec92b94320 is in history
Change-Id: I155dc9f533a467f8ed1fd2a162b09969d80392dc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions