diff options
| author | Robin Lee <rgl@google.com> | 2016-05-17 09:24:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-17 09:24:59 +0000 |
| commit | 36eb3771c14685ce8e6e390ea73f08cf55275a6f (patch) | |
| tree | 8cb4ab099e9ea13744a0169b4617fff77492a495 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | ec200415f587f6739990056c8e2eb2c1e42eded9 (diff) | |
| parent | bc73347152a3562a7f957a07433d64912f4acd83 (diff) | |
Merge "Skip \'network may be monitored\' if dying or locked" into nyc-dev
am: bc73347152
* commit 'bc73347152a3562a7f957a07433d64912f4acd83':
Skip 'network may be monitored' if dying or locked
Change-Id: I8a0818074887fd20c0204098a6824ec9e9589dfa
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions