diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2016-06-20 22:40:40 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-20 22:40:40 +0000 |
| commit | 152f56aa1b6080b5d9d385f8f5e2c43b80c4419a (patch) | |
| tree | 12fd681f530c86e19341722643cb7407642585cc /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 7c425a76de70b6599450e56f12f8001afb8e488a (diff) | |
| parent | 2704d4ead14f0d450182aa93020821fba3a26038 (diff) | |
Merge \\"Revert \\"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\\"\\" into nyc-mr1-dev am: 55d9051e58
am: 2704d4ead1 -s ours
Change-Id: Icb8b53c17aa76979f779361c202d209ac17bc63f
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions