diff options
| author | David Friedman <dmail@google.com> | 2015-01-06 22:35:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 22:35:54 +0000 |
| commit | b64dea3607ee12b3fd0e164b5c5fc90791bcdccd (patch) | |
| tree | 0040d052e94c5f1c73d4e2f8ec14fc9a0bb405d7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 698f1557ff32c38b76891787050c64c2e01fd794 (diff) | |
| parent | 859e176bfeb36cfafc1d8ed0a8748aefa2cf1982 (diff) | |
am 859e176b: am aed8152d: am 2d179c89: am 919ecb22: am 58a5e3db: Merge "Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e" into lmp-docs
* commit '859e176bfeb36cfafc1d8ed0a8748aefa2cf1982':
Android TV initial (time-sensitive) localization release for Japanese partners. Bug: 18527238 Change-Id: Id933695738a07aa0a1c02783e022dd8b98bbf98e
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions