diff options
| author | Jason Monk <jmonk@google.com> | 2014-10-01 15:14:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-01 15:14:26 +0000 |
| commit | 9e280c447f5f8747f7c4777d80d5dd7c25e7713e (patch) | |
| tree | 2d25a34812d5ccc49bd92cc201d746001a1664d9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 6d7a0cd57f75e3b88a7f8a0f74694c8c049784c3 (diff) | |
| parent | 15349991240bb9443d704b4ac85915f474e5108c (diff) | |
am 15349991: am e7b18d2b: Merge "Pull roaming from mServiceState for consistency" into lmp-dev
* commit '15349991240bb9443d704b4ac85915f474e5108c':
Pull roaming from mServiceState for consistency
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions