diff options
| author | Adam Cohen <adamcohen@google.com> | 2012-11-08 16:39:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-08 16:39:16 -0800 |
| commit | c1ae43ade0baa4dc8af1b505ba4b83f0f72c6dd8 (patch) | |
| tree | bcd8c9d74216120fe142bd89848b87156abf4852 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b82b3b5754305c36cfeb7c87816110da3c7b2ff4 (diff) | |
| parent | f69320a1f02de3106a26a3911c25be63fcfaf738 (diff) | |
am f69320a1: Merge "Preventing more than five widgets from being added in the carousel (issue 7502935)" into jb-mr1-dev
* commit 'f69320a1f02de3106a26a3911c25be63fcfaf738':
Preventing more than five widgets from being added in the carousel (issue 7502935)
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions