diff options
author | Bill Yi <byi@google.com> | 2019-02-20 08:40:18 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-02-20 08:40:18 -0800 |
commit | 4fdfd5835092a2f25b89b1f61ae32d37fdb36c8c (patch) | |
tree | 0be15f0f2bb113ab86ce293b3dfd4cf01ce9b29a /rs/java/android/renderscript/Program.java | |
parent | d17fca2cb239736b5ed29c2d7ab8f63dc87a57ea (diff) | |
parent | 54d59477930db7c17c57fc830b5a185bba694cf0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 85288a5e3c -s ours
am: 54d5947793 -s ours
am skip reason: subject contains skip directive
Change-Id: I8e524ba33fe382b607d9cb40e0cb66c6054b35b0
Diffstat (limited to 'rs/java/android/renderscript/Program.java')
0 files changed, 0 insertions, 0 deletions