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)
commit6042c0f8cc1be0cfe087196beba64f68fbfbd4dd
treee5088fc2f58160f2f709640306ca31edea87d84a
parentdaba10fb3af009314b7c9016b78e38983c510da6
parent234922bb976359dd1d86a95b938bcb30cf29bb23
Merge branch 'dkoch_fix_apk_args' into 'master'

Add disable-shader arg to sample Android launch command

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

See merge request !382