diff options
| author | Jeff Brown <jeffbrown@google.com> | 2013-05-30 18:00:08 -0700 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-30 18:00:08 -0700 | 
| commit | 6474d8407cb1551608fc403861e11cf514f8558e (patch) | |
| tree | 3d796250c5455321ff3ebcd33576b1b8c55e58fb /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | f7d8d8bfc57f46243398034216cd15938df76346 (diff) | |
| parent | 636af7a1cb90bb2f422bc85356d30f5b4e9342e6 (diff) | |
am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions
