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