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