diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-10 17:17:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 17:17:38 +0000 |
| commit | 5b114e85ea46691629b16483d8519982a332b8fb (patch) | |
| tree | 771e96b8049f69a0d332cd8fbd8f56459fb31b9e /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | deb466201ae333fe343d7aefb69366eea8dbc48a (diff) | |
| parent | 30a7f56cfbb1d82b3c3269fee5f9e0bb8f5c3eb4 (diff) | |
am 30a7f56c: (-s ours) am 7d447f73: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '30a7f56cfbb1d82b3c3269fee5f9e0bb8f5c3eb4':
Import translations. DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions