diff options
| author | Bill Yi <byi@google.com> | 2016-05-23 16:12:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 16:12:52 +0000 |
| commit | e426faf6fadc6a25c8621fc2420025bf46606dae (patch) | |
| tree | 3f7529d6452f80d957ea5996e34e2f1ee397ee44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 71f88b4adb8e2cda6d429acef6967f09b1cd0f3e (diff) | |
| parent | 71f8032a6a9f4de4337e7157918614bbd67257a6 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 18947ba2fa -s ours" into nyc-mr1-dev-plus-aosp
am: 71f8032a6a -s ours
* commit '71f8032a6a9f4de4337e7157918614bbd67257a6':
Import translations. DO NOT MERGE
Change-Id: Iac961329f40592c1f23cec49ee9a0a5e8bfc52d0
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions