diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-12-05 20:18:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-05 20:18:45 +0000 |
| commit | 704c8c0c3b2753c8d91aef23d39a9f6255389fd3 (patch) | |
| tree | 18677d118dd9d8ef55412558e4ab4f346ffdd0f9 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 12120998f8b34c809d8f29790a8f74e624b26e38 (diff) | |
| parent | 461e73677d208e4e97356cbc781ce490b90e2027 (diff) | |
am 461e7367: am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit '461e73677d208e4e97356cbc781ce490b90e2027':
Remember to cancel lingering when a network again satsifies a NetworkRequest.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions