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