diff options
author | James Mattis <jmattis@google.com> | 2021-01-27 05:45:23 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-01-27 05:45:23 +0000 |
commit | b214f23e6123182997fe9dc4a33bfc313438867a (patch) | |
tree | 40453b1f699fab8ed5a8431aaebfa1f2411b77b0 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 14dfb0cfe768ececc66e7ed6b1fc7648c2da1834 (diff) | |
parent | 7329e83d2f3b9e7858d00e0fdea55380ac78b0c7 (diff) |
Merge changes Ic67cff95,Id7a6175c,I3d6896f5,Iaff727e7 am: 96ccce1940 am: 7329e83d2f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527006
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If95476bce2e340fb95a64f314ba0fef420f14294
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions