diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:33:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:33:40 +0000 |
| commit | 4761069d536b4a6b5003499277a63bf37d5a12be (patch) | |
| tree | 2ccd3e5cd0a5778286a63bf9cbbde39dcf0d57eb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 39181238a78d47b6c538624b9a361411502a90f7 (diff) | |
| parent | 774f4e43c5c170d377be22d4181e4466504323f3 (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 12d1f5d5c0 -s ours
am: 774f4e43c5 -s ours
* commit '774f4e43c5c170d377be22d4181e4466504323f3':
Import translations. DO NOT MERGE
Change-Id: Icc668bbb228ff5d2fb6b3b6bf5cf24eeb3703db1
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions