diff options
author | Bill Yi <byi@google.com> | 2019-09-25 22:05:58 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-09-25 22:05:58 -0700 |
commit | df12f3c04880282ede2a854ec99f278005ac4935 (patch) | |
tree | 3c1b7fd33ffd5e0318525d990479be98c2f7c421 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | d58d6cb903c4bee076b8a8dc09156934b24e9273 (diff) | |
parent | a8a40a5109ef42959ab4c19f5523eb2b0b3a8bb2 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 251a4aa05b -s ours am: 86ff1a8c0f -s ours
am: a8a40a5109 -s ours
am skip reason: subject contains skip directive
Change-Id: I115b7374b589485507113da9b4637fcdbdd97a5e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions