diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-09-23 11:21:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-23 11:21:27 +0000 |
| commit | 4cbfe3316fd1105b697a9838ef7bafaebf5080a2 (patch) | |
| tree | a2088c5c74bdc373d9aeb37598bfa5273e97b4e6 /rs/java/android/renderscript/RenderScript.java | |
| parent | 10a7d7449dae2aabf4f22f980e7efabf274a939a (diff) | |
| parent | 773d71e7c45d12810267bb24735360da6e5b258d (diff) | |
am 773d71e7: am 962c3a0f: am ece4ac21: Merge "Don\'t mark NetworkRequests restricted when they don\'t have restricted caps" into lmp-dev
* commit '773d71e7c45d12810267bb24735360da6e5b258d':
Don't mark NetworkRequests restricted when they don't have restricted caps
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions