diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2015-07-28 02:02:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-28 02:02:59 +0000 |
| commit | 2ae3a05b424f7ef7c3a28507e2c19fde7f1e5963 (patch) | |
| tree | f7341afcff5dc44e051427ed5446cc04ec0c4f5b /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 5441a7b3c232a90be1326dabfadd5a222e2bc268 (diff) | |
| parent | b0014e9f38bb7e01ba488e50c61f3fc9a7aaf9fc (diff) | |
am b0014e9f: am 08ef66bb: am 62ca62b3: am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev
* commit 'b0014e9f38bb7e01ba488e50c61f3fc9a7aaf9fc':
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