diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:41:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:41:51 +0000 |
| commit | f2ff2edcec6e41e452cabd49b2838827d980ba5e (patch) | |
| tree | a9644bf1d5f1972ec4ce81b857b823560b500b2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13d3aa5341113719b2277c4ccf2d6c30617d55ed (diff) | |
| parent | 98bf3c28e6792ac2a9511ea4446a147b2c90a590 (diff) | |
Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 24708d9c8e -s ours am: a2ff3943b2 -s ours" into nyc-mr1-dev-plus-aosp
am: 98bf3c28e6 -s ours
* commit '98bf3c28e6792ac2a9511ea4446a147b2c90a590':
Change-Id: Id73afc339de8dc55c60c4d430ece800e8e36ab03
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions