diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-28 22:27:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-28 22:27:44 -0700 |
| commit | 897d98a7530109bff8d73b3651d8884c76f54c42 (patch) | |
| tree | 0bfda31e3fb76a26398f98b2f0c9e23b9ec542fd /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | a1f49d8bb77db20617f9ea372ad9f1a9e06deece (diff) | |
| parent | 6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354 (diff) | |
am 6ea0636a: Merge "Revert "Revert "Change GATT_FAILURE from 0 to 0x101""" into jb-mr2-dev
* commit '6ea0636a9c6e3661d6a9ac443eba5b9b6a0d7354':
Revert "Revert "Change GATT_FAILURE from 0 to 0x101""
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions