diff options
| author | Joe Malin <jmalin@google.com> | 2013-05-29 15:34:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-29 15:34:30 -0700 |
| commit | fb6b3348d3587b14d05a00f92f5c511339999be0 (patch) | |
| tree | a7517b0a39e0b9b2337562a02f5f15c6f2b4e410 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 4bbc41907f05cd7aeda0b868736b87156b86dec0 (diff) | |
| parent | 40062914b524599c502b905100392ed513ec98bc (diff) | |
am 40062914: am c77e2ade: am b8339676: am 4aeb8cb3: am 1e4cfd8e: am f0bca903: am e55ba431: Merge "Docs bug fix: B9085293 - Stop Location Updates" into jb-mr1.1-docs
* commit '40062914b524599c502b905100392ed513ec98bc':
Docs bug fix: B9085293 - Stop Location Updates
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions