diff options
author | Bill Yi <byi@google.com> | 2019-09-25 22:00:51 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 22:00:51 -0700 |
commit | fd8f5dc84128b4366cd13a5da02569d1b0280471 (patch) | |
tree | 0cb4de1e51ab0831b5df5f427cb083b05f112412 /rs/java/android/renderscript/ProgramStore.java | |
parent | d814d68a191b9c2299920a9795d36f0e82280584 (diff) | |
parent | 9e4189fef5593a2c020a2eeafdb0247a70449006 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4160fa8a6d -s ours
am: 9e4189fef5 -s ours
am skip reason: subject contains skip directive
Change-Id: I41e5a560295149dcea0500a50b07582f9cd1dae8
Diffstat (limited to 'rs/java/android/renderscript/ProgramStore.java')
0 files changed, 0 insertions, 0 deletions