diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2013-02-01 13:28:12 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-01 13:28:12 -0800 |
commit | 9fd4893c56747a154094ecf1a1733a5faf7f8976 (patch) | |
tree | 95149376e52a2001fffd660f21f6aa1a886d26c7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 65fd9811d3b00698ab25233543c2e49ef22c634b (diff) | |
parent | 7bac3614ff0ee3cef83147cb569c96c00beab919 (diff) |
am 7bac3614: Merge "Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE" into jb-mr1-dev
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '7bac3614ff0ee3cef83147cb569c96c00beab919':
Fix Javadoc for View layoutDirection / textDirection / textAlignment - DO NOT MERGE
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions