diff options
author | Amith Yamasani <yamasani@google.com> | 2013-05-15 13:34:55 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 13:34:55 -0700 |
commit | e3a133a815fc1b8b9e39c499f251e36c87346e1c (patch) | |
tree | e8513de40366ba678fbe20113146b6ed45f2da31 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
parent | 777e2e8545e37dfaf27f0f0ccd835f64fab7b746 (diff) | |
parent | b865d578158150a13ca080c2525091a7722e75e3 (diff) |
am b865d578: Merge "Opt-in Settings package to see restricted accounts" into jb-mr2-dev
* commit 'b865d578158150a13ca080c2525091a7722e75e3':
Opt-in Settings package to see restricted accounts
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions