diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2014-05-29 15:20:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-29 15:20:50 +0000 |
| commit | 3b95b2fa7a9de00199d3d84cf2dbd46ea9634582 (patch) | |
| tree | 48c725befd6c6a7bd229ce87405bf75774811936 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | b6102427ae0575cc1d32b94ec2dcac00fb81db4a (diff) | |
| parent | 33051471cf98e74d1b986d0d7c48806be29cc400 (diff) | |
am 67cf4bad: Merge "Don\'t break things if a network goes back to CONNECTED." into lmp-preview-dev
* commit '67cf4bad7bad05ff0a3a0704305c9eed4c92a338':
Don't break things if a network goes back to CONNECTED.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions