diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-31 04:30:45 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-10-31 04:30:45 +0000 |
| commit | 88395590b6904152c1a6f3ac3e71a9c9fe731c61 (patch) | |
| tree | 34cdc72ca65dc1ce56a614b78c74e9e4d8a5f54b /rs/java/android/renderscript/ProgramStore.java | |
| parent | 88ca60f343e8cec3937728fe0db574dc3c6d4b7f (diff) | |
| parent | 7330df7c7eff0b138a5cbdd1952764e99c5372e9 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: 5257a22102 -s ours am: 642af56b32 -s ours am: 8a30650cc6 -s ours" into rvc-qpr-dev-plus-aosp am: 7330df7c7e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12956070
Change-Id: Ibd582ac30c829c0a9103d1fcb5acf2443f9b461a
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions