diff options
| author | Justin Koh <justinkoh@google.com> | 2014-02-25 00:32:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-25 00:32:54 +0000 |
| commit | ef57d0214424607e39ae7e9bdd32d7ea8b651ed7 (patch) | |
| tree | 430e7f39627c59e69fd2c7c431c982579da609e2 /rs/java/android/renderscript/ProgramFragment.java | |
| parent | cc28a41b48bc687002a9e1fc436d00ca6f0c3692 (diff) | |
| parent | ffbe7f83ebc072d676e25c86d8ceb60205a9ec8a (diff) | |
am ffbe7f83: (-s ours) am 22352885: am bf3a45f3: Merge "DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp" into klp-modular-dev
* commit 'ffbe7f83ebc072d676e25c86d8ceb60205a9ec8a':
DO NOT MERGE EGL14.eglCreateWindowSurface should set producerControlledByApp
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragment.java')
0 files changed, 0 insertions, 0 deletions