diff options
| author | Dan Sandler <dsandler@android.com> | 2014-06-05 09:47:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-05 09:47:47 +0000 |
| commit | 138a7aea27de4ae3fd2ce0d18e77ca3989824848 (patch) | |
| tree | b4ec2e01d94f0407fc963ed1006cebd7f3866e4b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b6011c1c2a2452174c7ce973e1867b912996081d (diff) | |
| parent | c03f429b9f6bd4f456d4b128b7e8c1ee8f29f3be (diff) | |
am 8c2079c2: Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev
* commit '8c2079c2ce89bb7311f6db08f5f0d09e262d650f':
Platlogo: The icon now matches the activity.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions