diff options
author | Scott Main <smain@google.com> | 2014-04-17 19:35:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-17 19:35:31 +0000 |
commit | 1b866eeb58867fd9bb2496dacdd3283c18893792 (patch) | |
tree | 03e2a1cf34a31ee55b4228cae02e9d9dd52f056a /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 004263eda24b672dc4fb42fe2cc931652e4e12ad (diff) | |
parent | 2b7345e4e3eaa7fcf2f24ba4d03ae00a265adedc (diff) |
am 2b7345e4: am b04f3f74: am cb38ee51: am a106923e: Merge "add image itemprop to specify image for search result snippet" into klp-docs
* commit '2b7345e4e3eaa7fcf2f24ba4d03ae00a265adedc':
add image itemprop to specify image for search result snippet
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions