diff options
author | Paul Hu <paulhu@google.com> | 2021-03-12 09:07:27 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-12 09:07:27 +0000 |
commit | 2736178b20f28e7218e16542de8b66956d24ab12 (patch) | |
tree | c81e00edce3e904e44e0752c3c589d5f419d56cd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | dd634fea9b3d6ac286fd43a6cb06c61665de5e7b (diff) | |
parent | 699725db4b22612a4d873089059120421d1a8048 (diff) |
[automerger skipped] Merge "Expose Intent#ACTION_CLEAR_DNS_CACHE" am: 240fdc5d97 am: 844a524110 am: 699725db4b -s ours
am skip reason: Change-Id I30b1b146dcae82926be7bdb8b343635a01eabefe with SHA-1 06caf5d5b6 is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1625867
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I5bfe5ba8f5b2fa3f238dcc2d07c3aed12726d154
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions