Merge branch 'dkoch_fix_apk_args' into 'master'
authorPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 20:29:47 +0000 (15:29 -0500)
committerPyry Haulos <phaulos@google.com>
Fri, 22 Jan 2016 20:29:47 +0000 (15:29 -0500)
Add disable-shader arg to sample Android launch command

It was added to an earlier section, but missed here.

See merge request !382


Trivial merge