diff options
| author | Todd Kennedy <toddke@google.com> | 2015-09-25 22:17:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 22:17:06 +0000 |
| commit | 389bb7f509fc74de3656492a9c474c11bcc96e5b (patch) | |
| tree | d86c03e691c75afbaef3d7d6df880a74e235ecd5 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 3197cd36fef11b1fdd59bdd341f65f9f2364ed2a (diff) | |
| parent | 9f8602644418ecfb1a5c9555792ceed285fa72bd (diff) | |
am 9f860264: resolved conflicts for 7de7e0b0 to stage-aosp-master
* commit '9f8602644418ecfb1a5c9555792ceed285fa72bd':
Pass dexopt flags as integer
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions