diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-29 04:41:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 04:41:02 +0000 |
| commit | a9e38e768908c2acb351768802262dca8c2242dc (patch) | |
| tree | 927ddc20a4f171f9cd6146a9b5cab54361bfa2d8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 64f34bbc88374a40b3d38a4927c6ed529c796adf (diff) | |
| parent | 9ba5f8421279bff33ce6d52373c8967dce678c30 (diff) | |
[automerger skipped] Merge "Use unstable networkstack AIDLs in development branches" am: f1881eb41a am: 512159bffd -s ours am: 9ba5f84212 -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: I1e88786727ec4a32665bf4b36e66f39bd58c672b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions