diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-06-29 04:52:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-29 04:52:35 +0000 |
commit | 78b06fdf4362d9bf47f66480a0fe08db976e7ce2 (patch) | |
tree | 927ddc20a4f171f9cd6146a9b5cab54361bfa2d8 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3782a292e17c940034d632713c23f58105e4e830 (diff) | |
parent | a9e38e768908c2acb351768802262dca8c2242dc (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 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: I24a63f122e3d09a1162ca2ee81d872f0f70c52ee
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions