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