diff options
| author | Peter Ng <petergng@google.com> | 2012-08-13 16:59:07 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-13 16:59:07 -0700 |
| commit | 806d53c3db6588920e3d704b184c9b7e9474338d (patch) | |
| tree | e862d28471ee06ede86ccffdc71b7e78e7b0e413 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 97b6f6cf9ad5c24e3626b69070e92e36d5173b14 (diff) | |
| parent | 55ed7e34b981e9725f664587c6ca1f43d78c3f6e (diff) | |
am 55ed7e34: am 3e504ac7: Merge "Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed" into jb-dev
* commit '55ed7e34b981e9725f664587c6ca1f43d78c3f6e':
Multiple design styleguide fixes -Changing extras to videos -new bullet item in swipeviews -new in 4.0 removal -Ui overview notification info -reppling typo fixed
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
