diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:05:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:05:07 +0000 |
| commit | 05b2250d541e3cb057af9eb45b964f60c2a08900 (patch) | |
| tree | 8d7e5311c0b596c5abecd47fa8c19d9f757cfdb1 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b53c4e68ece0086c9089a29051a32b7ec260efeb (diff) | |
| parent | b51541753a6267065d93a0846060467ce5bf1688 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: b51541753a -s ours
* commit 'b51541753a6267065d93a0846060467ce5bf1688':
Import translations. DO NOT MERGE
Change-Id: I63d94012dae2053fa343ad5ffc0bf0751a46e6b5
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions