tree 07c3ecdcbdfc8dd3f24bb917d80381563b2dba1a
parent 1eb2bf1d489bab86b13014ae2af8362e0557a75f
parent dc209330cece9e680b7ae0677835e513f91c99f2
author Nicolas Capens <capn@google.com> 1502819078 -0400
committer Nicolas Capens <capn@google.com> 1502819111 -0400

Merge commit 'dc209330cece9e680b7ae0677835e513f91c99f2' into cloud-android-current-release

Merges in changes from the master branch. Includes eliminating
generating MMX instructions, emulating Subzero intrinsics for ARM,
and floating-point filtering extension using glHint.

Change-Id: I98eadb7c8b48284f39b8f2933f31427f38bb286a