diff options
| author | Pete Gast <pgast@google.com> | 2014-11-10 16:48:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-10 16:48:29 +0000 |
| commit | 2f6cd6489f84a89da425630c970d8c33d76ace74 (patch) | |
| tree | e4a9bece141426d33c76ead7cc0cf8fc445cb4fd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6db940088404f1b210c2e091476a74bf846f2d5e (diff) | |
| parent | 2ad988aa6e6f7fa89affcfc5b81ac3c28ea525ee (diff) | |
am 2ad988aa: am 642b4d93: am 705c9c13: Merge "Expand WearableExtender to customize labels." into lmp-mr1-dev
* commit '2ad988aa6e6f7fa89affcfc5b81ac3c28ea525ee':
Expand WearableExtender to customize labels.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions