diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2016-12-14 04:48:36 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-12-14 04:48:41 +0000 |
| commit | 5625d486b9a4eb602b13f6f2d261f1a27126b9b9 (patch) | |
| tree | 3924c4310d7816dd31ff45238016e359bc2ab865 /rs/java/android/renderscript/ProgramFragmentFixedFunction.java | |
| parent | 3a39fe6bed33f8f28ac0ffe447057af9ab962a3f (diff) | |
| parent | 1317e049f5657177f3ed1af8a7dbe815c47e1a81 (diff) | |
Merge "Display "Sign into network" in settings when on a captive portal." into nyc-mr2-dev
Diffstat (limited to 'rs/java/android/renderscript/ProgramFragmentFixedFunction.java')
0 files changed, 0 insertions, 0 deletions