Merge branch 'ndk-r11'
authorFredrik Fornwall <fredrik@fornwall.net>
Thu, 10 Mar 2016 23:23:09 +0000 (18:23 -0500)
committerFredrik Fornwall <fredrik@fornwall.net>
Thu, 10 Mar 2016 23:23:09 +0000 (18:23 -0500)

Trivial merge