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