diff options
| author | Baligh Uddin <baligh@google.com> | 2016-05-22 23:41:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-22 23:41:47 +0000 |
| commit | 13d3aa5341113719b2277c4ccf2d6c30617d55ed (patch) | |
| tree | a9644bf1d5f1972ec4ce81b857b823560b500b2e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 13d720c983021b3b65d8897d34846cdb13a138f2 (diff) | |
| parent | 74414f2444131a1cb5130f789566779e32710382 (diff) | |
Merge "Import translations. DO NOT MERGE am: cd669b648a -s ours am: 5cb9547cb7 -s ours" into nyc-mr1-dev-plus-aosp
am: 74414f2444 -s ours
* commit '74414f2444131a1cb5130f789566779e32710382':
Change-Id: I22dd078d8c84c5b0ba89432b5a6011a635a23138
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions