diff options
author | Michael Kolb <kolby@google.com> | 2014-06-16 22:13:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-16 22:13:29 +0000 |
commit | b8d5f476ffe192d84e33652fc87a14049dd18ffa (patch) | |
tree | 2ff7c653da580c4a02a28f262ca698601d3830a0 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 022fa3b057d860adf52eef09ebb03456f8fd0dd6 (diff) | |
parent | b936c57c2cda994cee20a72ee2b668629996a229 (diff) |
am b936c57c: (-s ours) am a730881d: Merge "DO NOT MERGE : Fix measuring with outset for orientation" into klp-modular-dev
* commit 'b936c57c2cda994cee20a72ee2b668629996a229':
DO NOT MERGE : Fix measuring with outset for orientation
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions