diff options
| author | Shawn Lin <shawnlin@google.com> | 2020-06-16 09:38:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 09:38:36 +0000 |
| commit | f5adbef7b6671f73e67e1e58c46e07ab23ab747d (patch) | |
| tree | a1be57791e8be45bc4d8c33970f4c34ba0f15cba /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | fdb136d4544b971ade4a9e191c443582a536e10e (diff) | |
| parent | 3983dda63e7cec263abe301bbb73e7a94aff9ff5 (diff) | |
Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff am: 3983dda63e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402
Change-Id: I20894bf425411158bbf06b56d6f99998346e2736
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions