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