diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-07-28 01:50:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 01:50:43 +0000 |
| commit | b0014e9f38bb7e01ba488e50c61f3fc9a7aaf9fc (patch) | |
| tree | 1deb1a1e16979d00076689e1f12689acbdabfb04 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 764707f03daaa781199b0bebacf159167d63c603 (diff) | |
| parent | 08ef66bbbc0e760a9d71f6a2c36014904fa0bae2 (diff) | |
am 08ef66bb: am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit '08ef66bbbc0e760a9d71f6a2c36014904fa0bae2':
Add a test for public bugs 2111 and 2136.
Always check off-link connectivity in NetworkDiagnostics.
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions