diff options
| author | Paul Jensen <pauljensen@google.com> | 2014-12-04 19:33:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-04 19:33:08 +0000 |
| commit | 461e73677d208e4e97356cbc781ce490b90e2027 (patch) | |
| tree | 2b8c6cdb6b2c81e1251c86f8d09ed6292d0a0aa7 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | e21aafab0d735935155860bd16dcc3ece81ce546 (diff) | |
| parent | efb81b9e965c4ba782151b6767e7e3df4f2cdfd2 (diff) | |
am efb81b9e: Merge "Remember to cancel lingering when a network again satsifies a NetworkRequest." into lmp-mr1-dev
* commit 'efb81b9e965c4ba782151b6767e7e3df4f2cdfd2':
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