diff options
| author | Peter Ng <petergng@google.com> | 2012-08-13 16:57:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-13 16:57:05 -0700 |
| commit | 55ed7e34b981e9725f664587c6ca1f43d78c3f6e (patch) | |
| tree | 9f704262a72c54cf97eeb2200f526c66d2d30fba /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ab0b9a9e4ec14d556d4c831168e09714c795fa4a (diff) | |
| parent | 3e504ac71715a1b152494c9765f41d13bc605b75 (diff) | |
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 '3e504ac71715a1b152494c9765f41d13bc605b75':
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