diff options
| author | Baligh Uddin <baligh@google.com> | 2014-12-02 22:27:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-02 22:27:22 +0000 |
| commit | 97267def8219d6ad3d8a96449b08653ae1bd6832 (patch) | |
| tree | 2eb8a369daef9530430dfc8dbb55376eac0d8237 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 52632ad881c96e785518e18fde1a72e6f6e25a42 (diff) | |
| parent | e3a160169bc26bcac35d1759423ab4e98a18d063 (diff) | |
am e3a16016: (-s ours) am 92ad4dd0: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'e3a160169bc26bcac35d1759423ab4e98a18d063':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions