diff options
| author | Bill Yi <byi@google.com> | 2016-06-03 17:43:26 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-03 17:43:26 +0000 |
| commit | d4983475ad4154894a280c703a3a9eb3a530db3e (patch) | |
| tree | 277720002bc21c9948a2146196c64f5c66b4d49a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ee5dd4e899262f89c53b71a6f14bed53d0060426 (diff) | |
| parent | 88fdea080fd9aa1ac2c31a8a2cb0ace3a0be924d (diff) | |
Merge "Import translations. DO NOT MERGE" into nyc-dev am: f79616b427 -s ours
am: 88fdea080f -s ours
* commit '88fdea080fd9aa1ac2c31a8a2cb0ace3a0be924d':
Change-Id: I227274dd96491fa95ba34f4cc611a88f674ca5d8
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions