diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 22:07:57 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-10 22:07:57 +0000 |
| commit | 926529c3b5a5ebde4176f5283ba0028e118b0d32 (patch) | |
| tree | 3c08fc2a5854bc9d041c3dc9704096d47d6cf021 /libs/rs/rsg_ScriptJavaClass.cpp | |
| parent | 0311d553d93e504b306d049874059ca63a3e1828 (diff) | |
| parent | f07b4c0e976549118de195926e81e4290ef3e88c (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 14d8e24fef -s ours am: c36033f80a -s ours am: 0c5d9530a9 -s ours" into rvc-qpr-dev-plus-aosp am: f07b4c0e97 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11818445
Change-Id: Iaca5910ebe7a73cf654188e73b7f0a2c54923631
Diffstat (limited to 'libs/rs/rsg_ScriptJavaClass.cpp')
0 files changed, 0 insertions, 0 deletions