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