diff options
| author | Shawn Lin <shawnlin@google.com> | 2020-06-16 10:04:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 10:04:30 +0000 |
| commit | 3144099d86a2f9f40b7ef774a7a2186a53299d72 (patch) | |
| tree | c323fa6f8d49088becbcb76b5fa31a5d6a694a25 /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | 50fbe62dd78039ebe82a6f0d490fa939304bffcd (diff) | |
| parent | 0ef3a5b33fd0bcb917b9716eccfa6416ee5659fc (diff) | |
Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff am: 095fe5e396 am: c55fd43c3c am: 0ef3a5b33f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402
Change-Id: Iea93a6d13edc7ec1ac026bafd8dc621c9f535c79
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions