diff options
| author | Bill Yi <byi@google.com> | 2016-05-23 16:15:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 16:15:19 +0000 |
| commit | d345b4af61fd33f44fbe023c678be0c23fc32dde (patch) | |
| tree | 3f7529d6452f80d957ea5996e34e2f1ee397ee44 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ff382e6ce8a5b81edf6c65ed0b6c36b93a90339c (diff) | |
| parent | 71caaa9f9d65e707a74188b0a6db8f05a75112c6 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 05be3b4541 -s ours am: 1a49e73d2a -s ours" into nyc-mr1-dev-plus-aosp
am: 71caaa9f9d -s ours
* commit '71caaa9f9d65e707a74188b0a6db8f05a75112c6':
Import translations. DO NOT MERGE
Change-Id: I65de625fa8270176de5e164ff959fee9dc01c794
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions