diff options
| author | junyulai <junyulai@google.com> | 2019-06-05 20:26:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-05 20:26:48 -0700 |
| commit | 2c081c08ac60ec9c471660d157f2a4174f33ccb0 (patch) | |
| tree | d6601609fa1b1071c985e4bb3e36bb2281846550 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 535c5a1c3ff7da655d7a174e8f11512549a2eba8 (diff) | |
| parent | 9ede677bb2c081ccdc41c8c3c19c949114bcc138 (diff) | |
[automerger skipped] Merge "Fix cannot create Nat-T keepalive on mobile data" am: c5bc106d53
am: 9ede677bb2 -s ours
am skip reason: SHA1 9ede677bb2 skipped by user junyulai
Change-Id: I08fd510c9613f075f00a0fffb41ee09a2f02f409
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions