diff options
author | Sooraj Sasindran <sasindran@google.com> | 2020-07-09 23:03:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 23:03:42 +0000 |
commit | acb884c5e9e663647d8ef44f90272660ea4d2b12 (patch) | |
tree | 52eaa10004dbf8f7c543c8bab97255c8d70490a5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 40d7c18746c21c104b877b1af3f57fc1fb18f4c3 (diff) | |
parent | 39877c432174f7fd3ed072eff242afab1e35bb46 (diff) |
[automerger skipped] Merge "Add hidden API to support allowed networks reason" am: dc52bd51d8 am: 39877c4321 -s ours
am skip reason: Change-Id If4424d7d94ac26ad31725a1658dad5751d0d2629 with SHA-1 7e4cd920e7 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1358929
Change-Id: Id262059c5c2b155fb40c4048bfc26fb672bd8fde
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions