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