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