diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2021-01-12 02:21:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-12 02:21:40 +0000 |
| commit | 0bf2dfbefcde24b3d2b8aada66ce516696b37ba1 (patch) | |
| tree | 3435d519e7aece038099419b6165ac78130591ab /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 8c9499011f6ec4b0fe0a9d32421cdf9b7576ca3f (diff) | |
| parent | aab03fb10ccd5fb1753cdcf1a193581de535fc6a (diff) | |
Merge "Revert^2 "Set setCurrentProxyScriptUrl as public"" am: 5aec9c87e4 am: aab03fb10c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1542625
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I444f0f93b395be595e58b1766e4f94f1a046bf2d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions