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