diff options
| author | Matthew Xie <mattx@google.com> | 2013-05-26 14:40:14 -0700 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-26 14:40:14 -0700 | 
| commit | e7e6bf9f02a0a74f0a8d3812d2a3a3f3ec855086 (patch) | |
| tree | f0ea6e1ad495f33852491e555c192eb4192655ca /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 84e1afcccc328e7a52bfde16e824a3ed37889d1d (diff) | |
| parent | 27e453617a2c179580a55d6cbe0619fa95adf693 (diff) | |
am 27e45361: Merge "Revert "Change GATT_FAILURE from 0 to 0x101"" into jb-mr2-dev
* commit '27e453617a2c179580a55d6cbe0619fa95adf693':
  Revert "Change GATT_FAILURE from 0 to 0x101"
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
