summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorLuke Huang <huangluke@google.com>2020-06-24 19:39:00 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 19:39:00 +0000
commite6496d48d682a69d1facda455fee493eb41c988a (patch)
treefaa941aedbeb206502abc8949a6888bae982eb0e /tools/aapt2/java/JavaClassGenerator_test.cpp
parent17bb9d27ba604840be4199a148f4c2b9147a4e42 (diff)
parentc6fa4855eb6449baaee67fb1864d146a52d009e6 (diff)
[automerger skipped] Merge "Disable sockets and DNS if process lacks INTERNET permission." am: bea02c1460 am: dac98f93a3 -s ours am: ad4d26c9a9 -s ours am: c6fa4855eb -s ours
am skip reason: Change-Id If002280fbad493dfc2db3d9d505c0257d49a9056 with SHA-1 6f214e8ebe is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1348586 Change-Id: I57be194bbe03b69d52a773490964c3191062d9eb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions