diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-28 09:17:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-01-28 09:17:08 +0000 |
| commit | df29f8e5d59d9c8136eb2a2fd6c3bd605887c7ca (patch) | |
| tree | 4d5f948b3a318bcd1650a3901db1c63355cae6a0 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 1df5bd7630f438ac76a89015efbbcb69035c1492 (diff) | |
| parent | a6438c2a3af4f81cfd6a4cfce697560bc0e3b682 (diff) | |
[automerger skipped] Merge "Support putting one Ethernet interface in server mode." am: e7e38501e8 am: 4461cfb024 am: a6438c2a3a -s ours
am skip reason: Change-Id Id96d581acb3fa4e52ca62dd94ec257f56bd3a1ce with SHA-1 30a8f7ef23 is in history
Change-Id: I3314b899730f367f154bd8b513094076084a6cef
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions