diff options
| author | Trevor Johns <trevorjohns@google.com> | 2016-04-20 18:35:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-20 18:35:57 +0000 |
| commit | 59c9a93fc268e226495d4ee8cf7c507c2ea2c433 (patch) | |
| tree | 30fbaa0b559bc0b5b65ef86ab104b58d20d67fe1 /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | db973df830c32af8e2aeff256053299409f65dfd (diff) | |
| parent | 483abe2d8b819470d480c30df6effcebe578a1f0 (diff) | |
Merge changes from topic 'merge_docs_nyc-dev' into nyc-dev
* changes:
Remove links to createAndInitializeUser() and createUser()
Resolve merge conflicts of a5060ee to nyc-dev
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions