diff options
| author | Leon Scroggins III <scroggo@google.com> | 2015-06-15 14:48:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 14:48:20 +0000 |
| commit | 16470b4b407f3c522e61cf4bf7d580acc2f3a9ec (patch) | |
| tree | 961bfc1d85e937315b75c4d50595579783da6909 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 794e06dfa9da7596b8f22a3c25b606fcdb1076f4 (diff) | |
| parent | e7641e295d3f366b5269cbeeb1ca97a4c99b3791 (diff) | |
am e7641e29: am c3809332: am 8c9ae41b: (-s ours) am 303581be: resolved conflicts for merge of 3ff978a5 to cw-d-mr1-dev
* commit 'e7641e295d3f366b5269cbeeb1ca97a4c99b3791':
DO NOT MERGE: Ensure that unparcelling Region only reads the expected number of bytes
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions