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