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