diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-02 14:06:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 14:06:29 +0000 |
| commit | 724ad179eeb64b836b4ef3da29f2c01b3cb80331 (patch) | |
| tree | 79a8e1fa0dd214e57a722dc98a1bbb736a9d2a3f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 40ea807f255e1e17cf27e59456e282eafff1bce1 (diff) | |
| parent | 7b43f3a2cbabdf9e23f27e5b77fa18d6911e4478 (diff) | |
am 7b43f3a2: (-s ours) am 3f27483f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '7b43f3a2cbabdf9e23f27e5b77fa18d6911e4478':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions