diff options
author | Scott Main <smain@google.com> | 2013-06-11 14:10:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-11 14:10:16 -0700 |
commit | 2ccb564d8066972847d8a5e4b8820c72638134b1 (patch) | |
tree | 4041abb61f26909778d76f145cd863b27ffb1b2b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
parent | 26560925f7326f8144d5b58419adb6b24bb9a0fd (diff) | |
parent | 938e8b67c2c9d0e4c797a317a10148be42aa80ec (diff) |
am 938e8b67: am d731c902: am f0380a26: am 343f581d: Merge "fix typo and clarify class references in database lesson bug: 9372560" into jb-mr1.1-ub-dev
* commit '938e8b67c2c9d0e4c797a317a10148be42aa80ec':
fix typo and clarify class references in database lesson bug: 9372560
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions