diff options
| author | smain@google.com <smain@google.com> | 2014-10-17 18:52:00 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-17 18:52:00 +0000 |
| commit | 5380545023a7c7cbf690c732c3edab6d140d32fa (patch) | |
| tree | f116847dd95bd0d08e59edd5d32009c5d8017066 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 36d13e6ae8ccef31fde01118fd457f13f10d288f (diff) | |
| parent | 4a0f162df7ca0079b25b61cd4734340cbe5de7f4 (diff) | |
am 4a0f162d: am c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
* commit '4a0f162df7ca0079b25b61cd4734340cbe5de7f4':
add Lollipop highlights and revision to 5.0 API overview intro
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions