diff options
| author | Jason Monk <jmonk@google.com> | 2015-07-24 03:38:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 03:38:09 +0000 |
| commit | 184044e499a36297e01ce6d3bd55b7c9026be178 (patch) | |
| tree | 3f19b6e4cdd9a7b0c8075d5788db745defda3376 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 969bc9f7da19cb429ca850fe6205a9a9b48e1c6d (diff) | |
| parent | 42caf39947e9f90834deb1aba251ee45c85d6045 (diff) | |
am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev
* commit '42caf39947e9f90834deb1aba251ee45c85d6045':
Fix emergency only when no sims
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions