diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2015-07-24 21:07:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 21:07:08 +0000 |
| commit | 9b9a0e509890bbccb5d0f32f2affce1f88539676 (patch) | |
| tree | 356bef22a733c6490ab3d6c2ce933d26561d068c /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5891a346abbde5bfe95a52633d05533406cc6a2e (diff) | |
| parent | 58b2d330b71412ac66ad38b7caf15920bc93f59a (diff) | |
am 58b2d330: (-s ours) am 0b9624d4: am 98961ea0: am 7385aca1: am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev
* commit '58b2d330b71412ac66ad38b7caf15920bc93f59a':
DO NOT MERGE Enhance local log.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions