diff options
| author | Robert Schaub <rschaub@google.com> | 2015-07-14 00:59:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 00:59:43 +0000 |
| commit | e8bbe9a0ab507eac9fa8ea51cfeb7c5a90545ce9 (patch) | |
| tree | 191ed65094e3c8d881aa80e585f839df6352caf9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | af5b992c85e589e11a3063a47a97829eef4e218d (diff) | |
| parent | 9de5dcac9589d064414a2ff6f3b76dc40c1b8765 (diff) | |
am 9de5dcac: am 70d39c28: am 2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs
* commit '9de5dcac9589d064414a2ff6f3b76dc40c1b8765':
docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions