diff options
| author | Luan Nguyen <luann@google.com> | 2015-05-18 18:49:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-18 18:49:24 +0000 |
| commit | babfbc219010fdda8fdc6ca5a5ac96a055307cfb (patch) | |
| tree | 05234de1b258dbd302f85f8df1569303fe62572f /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 962b8f2b10e34b27c072a64cdedd28497883bbc7 (diff) | |
| parent | 304ed7162de489cd1393b770460fe58a0ae91beb (diff) | |
am 304ed716: am e14ffac6: am 193841be: Merge "docs: Add tag heuer logo to wear landing page" into lmp-mr1-ub-docs
* commit '304ed7162de489cd1393b770460fe58a0ae91beb':
docs: Add tag heuer logo to wear landing page
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions