diff options
| author | David Friedman <dmail@google.com> | 2015-01-17 00:43:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-17 00:43:30 +0000 |
| commit | 91678a69b26f218dd580704cd4f79c295c8c5951 (patch) | |
| tree | 453f4180cce9ab9ec475591caec8cc34567b30d7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | d5ff63ba0ce8597155e0201fd20fe18fbf0aa053 (diff) | |
| parent | ae71c8ea52af7e4205ae838e73837d145f416e1a (diff) | |
am ae71c8ea: am e255cb0f: am fa66fdd5: Merge "Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw" into lmp-docs
* commit 'ae71c8ea52af7e4205ae838e73837d145f416e1a':
Localization of high-level Android 5.0 pages: ja, ko, ru, es-419, pt-br, zh-cn, zh-tw
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions