diff options
| author | David Friedman <dmail@google.com> | 2015-01-06 22:28:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-06 22:28:43 +0000 |
| commit | 859e176bfeb36cfafc1d8ed0a8748aefa2cf1982 (patch) | |
| tree | d894669f57ed5793e681911578f0955bd321019b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 9ebb780ccb600b7528b88a4d7929243fb1205cca (diff) | |
| parent | aed8152d864b90363569c3a2de09de35048cfeb2 (diff) | |
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 'aed8152d864b90363569c3a2de09de35048cfeb2':
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