diff options
author | Sooraj Sasindran <sasindran@google.com> | 2020-07-09 23:39:54 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-09 23:39:54 +0000 |
commit | 5c9fe6598742baff1fb8f562bc9ba16452d8dfdd (patch) | |
tree | e8b85cc63b3ddff2ea7cd58425a949328ef6e4bc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | b7ff3b4b824d431b7b8cade25de248b15eeeb411 (diff) | |
parent | d6405c0782c73d20c8433b6fe665fa795baaf501 (diff) |
[automerger skipped] Merge "Add hidden API to support allowed networks reason" am: dc52bd51d8 am: 39877c4321 -s ours am: acb884c5e9 -s ours am: 93847d62df -s ours am: d6405c0782 -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: Ic9ffc2016f9de8ef59f0178607273c5f2c508f84
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions