diff options
| author | Shawn Lin <shawnlin@google.com> | 2020-06-16 10:05:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-16 10:05:24 +0000 |
| commit | 59869722c684fc2efdff78ade04cc0c5107a2b27 (patch) | |
| tree | c323fa6f8d49088becbcb76b5fa31a5d6a694a25 /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | cc25bee55e3959527d78f2ca622acf92e990074b (diff) | |
| parent | ad8c08b7ce5b6c4448350a8c4d513d1e135d79e7 (diff) | |
Merge "Fixed the conflict of the release methods of ActivityView & TaskEmbedder" into rvc-dev am: 1c2e8eafff am: 3983dda63e am: f5adbef7b6 am: ad8c08b7ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11862402
Change-Id: I31714556bfd6b8d41986b59dd4c721c678c92f46
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions