diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-01-28 09:57:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-28 09:57:25 +0000 |
| commit | 1f26de003c32f927c390fa10447c4b4b4fe134bd (patch) | |
| tree | 6a32c81c12a6e657a6a92e1be43157a9fe3df45a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 82dd3e14f8ecdc6802a60af8b9636c71fadba75b (diff) | |
| parent | 81728832028ba78bade59b6a85383b582ac2ea20 (diff) | |
[automerger skipped] Merge "Note network interfaces based on transport" am: 8334a265ad am: cd65235a77 am: 8172883202 -s ours
am skip reason: Change-Id I4e928fac8a57a9b1fc758a44af2a5719b8c871b8 with SHA-1 84f8c48420 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1562876
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ie00f6cdf0545b325d43e8b5491ee182bc6b4035b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions