diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-29 05:05:28 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 05:05:28 +0000 |
| commit | 5651ddf64b5f54bfb16dc1714ed896f58bd4341a (patch) | |
| tree | 0014b12bd217bafb606bad870e2a4b5e1112001c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0d68d05b1009ad4db0d708c903531e7c73d5e5af (diff) | |
| parent | 78b06fdf4362d9bf47f66480a0fe08db976e7ce2 (diff) | |
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: f1881eb41a am: 512159bffd -s ours am: 9ba5f84212 -s ours am: a9e38e7689 -s ours am: 78b06fdf43 -s ours
am skip reason: Change-Id I74b4a16266bda7b8ac740b3a0193268da260fc2f with SHA-1 7e24fd9a0b is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1343444
Change-Id: Ibf8a32647cda56751960107bca8ef55df2f9cefc
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions