diff options
author | Lorenzo Colitti <lorenzo@google.com> | 2021-02-03 14:15:05 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-03 14:15:05 +0000 |
commit | 5486c676e786c8e4159c9eac847fe899259278f4 (patch) | |
tree | 014d2c4db8b8896388cbc0c0c9ccdae040619b2f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 582c0420528ba4558ec925551ca7775c80102736 (diff) | |
parent | 04cc4f79721d2341984671b3fc67cde77de45858 (diff) |
Merge "Revert "Refactor setCurrentProxyScriptUrl to a void method"" am: 104426a03b am: 04cc4f7972
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1571900
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Ife8213b304f5645ed3f9f181576163aa7cec9f11
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions